diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-21 13:18:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-21 13:18:51 -0400 |
| commit | 9fee289d2406e8d018409e22f48cd853860177a1 (patch) | |
| tree | 0ec1f13c869fe239512d4797b7dd114db64eaca6 | |
| parent | 0b7bf3585a378bca4fc5bb551af3c37d517fdf28 (diff) | |
| download | tor-9fee289d2406e8d018409e22f48cd853860177a1.tar.gz tor-9fee289d2406e8d018409e22f48cd853860177a1.zip | |
Revert the broken part of 548b4be
Fixes 16152.
| -rw-r--r-- | changes/bug16152 | 3 | ||||
| -rw-r--r-- | 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 0000000000..8b93a60715 --- /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 8ed5ad227a..ae339ff844 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 |