[httpd: 1/2] systemd: send SIGWINCH signal without httpd -k in ExecStop
Jan Kaluža
jkaluza at fedoraproject.org
Thu Oct 24 10:30:20 UTC 2013
commit b3f304619b84e409ed109bd6fc4cad3c4fcf03d6
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Thu Oct 24 12:26:47 2013 +0200
systemd: send SIGWINCH signal without httpd -k in ExecStop
httpd.service | 2 +-
httpd.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/httpd.service b/httpd.service
index 52502b8..2dc16b9 100644
--- a/httpd.service
+++ b/httpd.service
@@ -24,7 +24,7 @@ Environment=LANG=C
ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
-ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop
+ExecStop=/bin/kill -WINCH $MAINPID
# We want systemd to give httpd some time to finish gracefully, but still want
# it to kill httpd after TimeoutStopSec if something went wrong during the
# graceful stop. Normally, Systemd sends SIGTERM signal right after the
diff --git a/httpd.spec b/httpd.spec
index 8315ff6..ddb0763 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -613,6 +613,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Thu Oct 24 2013 Jan kaluza <jkaluza at redhat.com> - 2.4.6-4
+- systemd: send SIGWINCH signal without httpd -k in ExecStop
+
* Thu Oct 10 2013 Jan Kaluza <jkaluza at redhat.com> - 2.4.6-3
- require fedora-logos-httpd (#1009162)
More information about the scm-commits
mailing list