4 Commits

Author	SHA1	Message	Date
Nick Mathewson	74a8555d2b	Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 ... Conflicts: contrib/dist/tor.service.in	2014-07-30 14:00:21 -04:00
intrigeri	0a70579784	Verify configuration file via ExecStartPre in the systemd unit file (#12730).	2014-07-30 16:56:55 +00:00
intrigeri	8b470ee4b5	Explicitly disable RunAsDaemon in the systemd unit file (#12731). ... 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.	2014-07-30 16:54:07 +00:00
Nick Mathewson	cae6388053	Put tor.service in the right place, and autoconfify it ... This closes 8368.	2014-04-29 13:17:30 -04:00