commit 9fee289d2406e8d018409e22f48cd853860177a1 Author: Nick Mathewson nickm@torproject.org Date: Thu May 21 13:18:51 2015 -0400
Revert the broken part of 548b4be
Fixes 16152. --- changes/bug16152 | 3 +++ contrib/dist/tor.service.in | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/changes/bug16152 b/changes/bug16152 new file mode 100644 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 8ed5ad2..ae339ff 100644 --- 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