[tor] fixed systemd unit file
ensc
ensc at fedoraproject.org
Sat Dec 17 12:01:43 UTC 2011
commit 632d78ca11259b82925b18d4299ee99f9a5c20d6
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:56:30 2011 +0100
fixed systemd unit file
customization of TimeoutSec + LimitNOFILE is not possible by environment
variables. Hardcode some values which can be overridden by the systemd
.include method.
tor.spec | 3 +++
tor.systemd.service | 8 ++------
2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 61c316e..3e67d52 100644
--- a/tor.spec
+++ b/tor.spec
@@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1701
- added 'su' logrotate option (#751525)
+- fixed systemd unit file; customization of TimeoutSec + LimitNOFILE is
+ not possible by environment variables. Hardcode some values which can
+ be overridden by the systemd .include method (#755167).
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.2.35-1700
- updated to 0.2.2.35 (security)
diff --git a/tor.systemd.service b/tor.systemd.service
index d8f36e8..2fabf70 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -3,17 +3,13 @@ Description = Anonymizing overlay network for TCP
After = syslog.target network.target nss-lookup.target
[Service]
-Environment = TOR_SHUTDOWN_WAIT=30
-Environment = TOR_NOFILE=4096
-EnvironmentFile = -/etc/sysconfig/tor
-
Type = simple
ExecStart = /usr/bin/tor --runasdaemon 0 --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
-TimeoutSec = ${TOR_SHUTDOWN_WAIT}
+TimeoutSec = 30
Restart = on-failure
-LimitNOFILE = ${TOR_NOFILE}
+LimitNOFILE = 4096
[Install]
WantedBy = multi-user.target
More information about the scm-commits
mailing list