diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-30 13:59:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-30 13:59:39 -0400 |
| commit | 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 (patch) | |
| tree | 0894f8ed1e68a282bc87c25a58dfc6495d4e0214 | |
| parent | 77609161f37dc37420f240410f2f546fc431cb8c (diff) | |
| parent | 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 (diff) | |
| download | tor-88590ed3a66423fd4de3ad10dc67f1c9b18bf047.tar.gz tor-88590ed3a66423fd4de3ad10dc67f1c9b18bf047.zip | |
Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
| -rw-r--r-- | changes/bug12730-systemd-verify-config | 3 | ||||
| -rw-r--r-- | contrib/dist/tor.service.in | 1 |
2 files changed, 4 insertions, 0 deletions
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 |