diff options
| author | intrigeri <intrigeri@boum.org> | 2014-07-29 12:13:01 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2014-07-30 16:56:55 +0000 |
| commit | 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7 (patch) | |
| tree | 33aeb68bcb5499789f98786cc3a5018b30b5a97b | |
| parent | 5c200d9be28ac9e53caac333ddd334539524d9e1 (diff) | |
| download | tor-0a705797840f893a94bd5b8b2cbb86e58a3a3fc7.tar.gz tor-0a705797840f893a94bd5b8b2cbb86e58a3a3fc7.zip | |
Verify configuration file via ExecStartPre in the systemd unit file (#12730).
| -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 |