From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jul 2014 12:13:01 +0000 (+0000)
Subject: Verify configuration file via ExecStartPre in the systemd unit file (#12730).
X-Git-Tag: tor-0.2.5.7-rc~19^2~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a705797840f893a94bd5b8b2cbb86e58a3a3fc7;p=thirdparty%2Ftor.git

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
index 0000000000..221633c78e
--- /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 5d7670281b..9914a78895 100644
--- 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