Put tor.service in the right place, and autoconfify it

This closes 8368.
This commit is contained in:
Nick Mathewson 2014-04-29 12:15:40 -04:00
parent a42e81eea1
commit cae6388053
4 changed files with 8 additions and 1 deletions

5
changes/ticket8368 Normal file
View File

@ -0,0 +1,5 @@
o Distribution:
- Include a tor.service file in contrib.dist for use with
systemd. Some distributions will be able to use this file unmodified;
others will need to tweak it, or write their own. Patch from
Jamie Nguyen; resolves ticket 8368.

View File

@ -1561,6 +1561,7 @@ AC_CONFIG_FILES([
contrib/operator-tools/tor.logrotate contrib/operator-tools/tor.logrotate
contrib/dist/tor.sh contrib/dist/tor.sh
contrib/dist/torctl contrib/dist/torctl
contrib/dist/tor.service
src/config/torrc.sample src/config/torrc.sample
]) ])

View File

@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service] [Service]
Type = simple Type = simple
ExecStart = /usr/bin/tor -f /etc/tor/torrc ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
ExecReload = /bin/kill -HUP ${MAINPID} ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT KillSignal = SIGINT
TimeoutSec = 30 TimeoutSec = 30

View File

@ -5,6 +5,7 @@ EXTRA_DIST+= \
contrib/dist/suse/tor.sh.in \ contrib/dist/suse/tor.sh.in \
contrib/dist/tor.sh \ contrib/dist/tor.sh \
contrib/dist/torctl \ contrib/dist/torctl \
contrib/dist/tor.service.in \
contrib/operator-tools/linux-tor-prio.sh \ contrib/operator-tools/linux-tor-prio.sh \
contrib/operator-tools/tor-exit-notice.html \ contrib/operator-tools/tor-exit-notice.html \
contrib/or-tools/exitlist \ contrib/or-tools/exitlist \