nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly disable RunAsDaemon in the systemd unit file (#12731).

Browse Source 
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.

The only solution I could find is to explicitly pass "--RunAsDaemon 0" when
starting tor from the systemd unit file, which this commit does.
This commit is contained in:
intrigeri 2014-07-29 12:23:04 +00:00
parent 5c200d9be2
commit 8b470ee4b5
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

@ -4,7 +4,9 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
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