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

Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5

This commit is contained in:
Nick Mathewson 2014-07-30 13:59:39 -04:00
parent 77609161f3 0a70579784
commit 88590ed3a6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug12730-systemd-verify-config Normal file
View File

@ -0,0 +1,3 @@
o Distribution:
- Verify configuration file via ExecStartPre in the systemd unit file.
Patch from intrigeri; resolves ticket 12730.

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

@ -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