diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-30 14:18:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-30 14:18:11 -0400 |
| commit | 0edb9b0492abbdd6c3ec397ad1f80c901568a713 (patch) | |
| tree | 8ac03d1ac22fa3708b3d4b73bffc25635a1817e0 /contrib | |
| parent | f8cbba7a33f0015f15f9246877df570c4cbff6d4 (diff) | |
| parent | 74a8555d2be2ce9d33e9814212e5de49ba089274 (diff) | |
| download | tor-0edb9b0492abbdd6c3ec397ad1f80c901568a713.tar.gz tor-0edb9b0492abbdd6c3ec397ad1f80c901568a713.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dist/tor.service.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 5d7670281b..2fe51c75d9 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -4,7 +4,10 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple -ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config +# A torrc that has "RunAsDaemon 1" won't work with the "simple" service type; +# let's explicitly override it. +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0 ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30 |