Browse Source

Revert the broken part of 548b4be

Fixes 16152.
Nick Mathewson 9 years ago
parent
commit
9fee289d24
2 changed files with 13 additions and 4 deletions
  1. 3 0
      changes/bug16152
  2. 10 4
      contrib/dist/tor.service.in

+ 3 - 0
changes/bug16152

@@ -0,0 +1,3 @@
+  o Minor bugfixes (systemd):
+    - Fix an accidental formatting error that broke the systemd
+      configuration file. Fixes bug 16152; bugfix on 0.2.7.1-alpha.

+ 10 - 4
contrib/dist/tor.service.in

@@ -8,10 +8,16 @@
 Description = Anonymizing overlay network for TCP
 After = syslog.target network.target nss-lookup.target
 
-[Service] Type = notify NotifyAccess = all ExecStartPre = @BINDIR@/tor
--f @CONFDIR@/torrc --verify-config ExecStart = @BINDIR@/tor -f
-@CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal =
-SIGINT TimeoutSec = 30 Restart = on-failure WatchdogSec = 1m
+[Service]
+Type = notify
+NotifyAccess = all
+ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
+ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+ExecReload = /bin/kill -HUP ${MAINPID}
+KillSignal = SIGINT
+TimeoutSec = 30
+Restart = on-failure
+WatchdogSec = 1m
 LimitNOFILE = 32768
 
 # Hardening