sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 

Conflicts:
	contrib/dist/tor.service.in
This commit is contained in:
Nick Mathewson 2014-07-30 14:00:21 -04:00
parent 88590ed3a6 8b470ee4b5
commit 74a8555d2b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changes/bug12731-systemd-no-run-as-daemon Normal file
View File

@ -0,0 +1,9 @@
o Distribution:
- Explicitly disable RunAsDaemon in the systemd unit file.
Our current systemd unit uses "Type = simple", so systemd does
not expect tor to fork. If the user has "RunAsDaemon 1" in their
torrc, then things won't work as expected. This is e.g. the case
on Debian (and derivatives), since there we pass
"--defaults-torrc /usr/share/tor/tor-service-defaults-torrc"
(that contains "RunAsDaemon 1") by default.
Patch by intrigeri; resolves ticket 12731.

4
contrib/dist/tor.service.in vendored
View File

@ -5,7 +5,9 @@ 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
# 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