Browse Source

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

Nick Mathewson 9 years ago
parent
commit
88590ed3a6
2 changed files with 4 additions and 0 deletions
  1. 3 0
      changes/bug12730-systemd-verify-config
  2. 1 0
      contrib/dist/tor.service.in

+ 3 - 0
changes/bug12730-systemd-verify-config

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

+ 1 - 0
contrib/dist/tor.service.in

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