diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-29 12:15:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-29 13:17:30 -0400 |
| commit | cae638805385ae0ef717eb21e1592aeb1d85182c (patch) | |
| tree | 25cb84d3825215f9df528eb8a14245e1b27550fb /contrib | |
| parent | a42e81eea10363654cde5724337c4aaea2bb40d0 (diff) | |
| download | tor-cae638805385ae0ef717eb21e1592aeb1d85182c.tar tor-cae638805385ae0ef717eb21e1592aeb1d85182c.tar.gz | |
Put tor.service in the right place, and autoconfify it
This closes 8368.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dist/tor.service.in (renamed from contrib/tor.service) | 2 | ||||
| -rw-r--r-- | contrib/include.am | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/tor.service b/contrib/dist/tor.service.in index 2780aaa51..5d7670281 100644 --- a/contrib/tor.service +++ b/contrib/dist/tor.service.in @@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target [Service] Type = simple -ExecStart = /usr/bin/tor -f /etc/tor/torrc +ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal = SIGINT TimeoutSec = 30 diff --git a/contrib/include.am b/contrib/include.am index 012079861..ede980678 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -5,6 +5,7 @@ EXTRA_DIST+= \ contrib/dist/suse/tor.sh.in \ contrib/dist/tor.sh \ contrib/dist/torctl \ + contrib/dist/tor.service.in \ contrib/operator-tools/linux-tor-prio.sh \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \ |