Remove tor.service.in

We aren't good at maintaining this; downstream maintainers are much
better at figuring out what is right for them.

Closes #30797.
This commit is contained in:
Nick Mathewson 2020-07-29 00:04:42 -04:00
parent 4e71fc92c8
commit 915af1a65b
5 changed files with 5 additions and 39 deletions

5
changes/ticket30797 Normal file
View File

@ -0,0 +1,5 @@
o Removed features:
- We no longer ship or build a "tor.service" file for use with systemd.
No distribution included this script unmodified, and we don't have the
expertise ourselves to maintain this in a way that all the various
systemd-based distributions can use. Closes ticket 30797.

View File

@ -2602,7 +2602,6 @@ AC_CONFIG_FILES([
Makefile
config.rust
contrib/operator-tools/tor.logrotate
contrib/dist/tor.service
src/config/torrc.sample
src/config/torrc.minimal
src/rust/.cargo/config

View File

@ -32,8 +32,6 @@ dist/ -- Scripts and files for use when packaging Tor
torctl and tor.sh are init scripts for use with SysV-style init
tools. Everybody likes to write init scripts differently, it seems.
tor.service is a sample service file for use with systemd.
operator-tools/ -- Tools for Tor relay operators
------------------------------------------------

View File

@ -1,35 +0,0 @@
# tor.service -- this systemd configuration file for Tor sets up a
# relatively conservative, hardened Tor service. You may need to
# edit it if you are making changes to your Tor configuration that it
# does not allow. Package maintainers: this should be a starting point
# for your tor.service; it is not the last point.
[Unit]
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=60
Restart=on-failure
WatchdogSec=1m
LimitNOFILE=32768
# Hardening
PrivateTmp=yes
PrivateDevices=yes
ProtectHome=yes
ProtectSystem=full
ReadOnlyDirectories=/
ReadWriteDirectories=-@LOCALSTATEDIR@/lib/tor
ReadWriteDirectories=-@LOCALSTATEDIR@/log/tor
NoNewPrivileges=yes
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install]
WantedBy=multi-user.target

View File

@ -2,7 +2,6 @@
EXTRA_DIST+= \
contrib/README \
contrib/client-tools/torify \
contrib/dist/tor.service.in \
contrib/operator-tools/tor-exit-notice.html \
contrib/or-tools/exitlist \
contrib/win32build/tor-mingw.nsi.in \