Verify configuration file via ExecStartPre in the systemd unit file (#12730).

diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config
new file mode 100644 (file)
index 0000000..221633c
--- /dev/null
+++ b/changes/bug12730-systemd-verify-config
@@ -0,0 +1,3 @@
+  o Distribution:
+    - Verify configuration file via ExecStartPre in the systemd unit file.
+      Patch from intrigeri; resolves ticket 12730.

diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 5d7670281b5a88b1c9f4876ea9c701323639dc4c..9914a7889512c1051d5d0f918fc9c2842c8ca138 100644 (file)
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -4,6 +4,7 @@ After = syslog.target network.target nss-lookup.target
 
 [Service]
 Type = simple
+ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
 ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
 ExecReload = /bin/kill -HUP ${MAINPID}
 KillSignal = SIGINT