Revert the broken part of 548b4be

Fixes 16152.

diff --git a/changes/bug16152 b/changes/bug16152
new file mode 100644 (file)
index 0000000..8b93a60
--- /dev/null
+++ b/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.

diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 8ed5ad227a5ca0b6d8c9588ae6e803e5109f9766..ae339ff8441e3d99c6ace76bbcc3d30c7c41e797 100644 (file)
--- a/contrib/dist/tor.service.in
+++ b/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