[thttpd] Fix PID file location in the systemd service file (#789662)
Matthias Saou
thias at fedoraproject.org
Mon Mar 26 14:10:04 UTC 2012
commit cbe6e4e4ed5e3b5a155603d18b9dada33760db07
Author: Matthias Saou <matthias at saou.eu>
Date: Mon Mar 26 16:09:49 2012 +0200
Fix PID file location in the systemd service file (#789662)
thttpd.service | 2 +-
thttpd.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/thttpd.service b/thttpd.service
index ef03b4e..2f20663 100644
--- a/thttpd.service
+++ b/thttpd.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/thttpd
+PIDFile=/var/run/thttpd.pid
EnvironmentFile=-/etc/sysconfig/thttpd
ExecStart=/usr/sbin/thttpd -C /etc/thttpd.conf
diff --git a/thttpd.spec b/thttpd.spec
index 97b8f5f..8474c20 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -4,7 +4,7 @@
Summary: Tiny, turbo, throttleable lightweight http server
Name: thttpd
Version: 2.25b
-Release: 26%{?dist}
+Release: 27%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.acme.com/software/thttpd/
@@ -115,7 +115,6 @@ pidfile=/var/run/thttpd.pid
EOF
-
%pre
/usr/sbin/groupadd -r www &>/dev/null || :
/usr/sbin/useradd -s /bin/false -c "Web server user" \
@@ -151,6 +150,7 @@ fi
/sbin/chkconfig --del thttpd >/dev/null 2>&1 || :
/bin/systemctl try-restart thttpd.service >/dev/null 2>&1 || :
+
%files
%doc README TODO
%{_unitdir}/thttpd.service
@@ -175,6 +175,9 @@ fi
%changelog
+* Mon Mar 26 2012 Matthias Saou <matthias at saou.eu> 2.25b-27
+- Fix PID file location in the systemd service file (#789662).
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25b-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list