nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug16162_026'

Browse Source
This commit is contained in:
Nick Mathewson 2015-07-20 11:01:58 -04:00
commit 0a329a7a05
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug16162 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (systemd):
- Tor's systemd unit file no longer contains extraneous spaces.
These spaces would sometimes confuse tools like deb-systemd-helper.
Fixes bug 16162; bugfix on 0.2.5.5-alpha.

44
contrib/dist/tor.service.in vendored
View File

@ -5,31 +5,31 @@
# for your tor.service; it is not the last point. # for your tor.service; it is not the last point.
[Unit] [Unit]
Description = Anonymizing overlay network for TCP Description=Anonymizing overlay network for TCP
After = syslog.target network.target nss-lookup.target After=syslog.target network.target nss-lookup.target
[Service] [Service]
Type = notify Type=notify
NotifyAccess = all NotifyAccess=all
ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config ExecStartPre=@BINDIR@/tor -f @CONFDIR@/torrc --verify-config
ExecStart = @BINDIR@/tor -f @CONFDIR@/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
Restart = on-failure Restart=on-failure
WatchdogSec = 1m WatchdogSec=1m
LimitNOFILE = 32768 LimitNOFILE=32768
# Hardening # Hardening
PrivateTmp = yes PrivateTmp=yes
PrivateDevices = yes PrivateDevices=yes
ProtectHome = yes ProtectHome=yes
ProtectSystem = full ProtectSystem=full
ReadOnlyDirectories = / ReadOnlyDirectories=/
ReadWriteDirectories = -@LOCALSTATEDIR@/lib/tor ReadWriteDirectories=-@LOCALSTATEDIR@/lib/tor
ReadWriteDirectories = -@LOCALSTATEDIR@/log/tor ReadWriteDirectories=-@LOCALSTATEDIR@/log/tor
NoNewPrivileges = yes NoNewPrivileges=yes
CapabilityBoundingSet = CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install] [Install]
WantedBy = multi-user.target WantedBy=multi-user.target