commit 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 Author: intrigeri intrigeri@boum.org Date: Tue Jul 29 12:13:01 2014 +0000

Verify configuration file via ExecStartPre in the systemd unit file (#12730). --- changes/bug12730-systemd-verify-config | 3 +++ contrib/dist/tor.service.in | 1 + 2 files changed, 4 insertions(+)

diff --git a/changes/bug12730-systemd-verify-config b/changes/bug12730-systemd-verify-config new file mode 100644 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 5d76702..9914a78 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