diff options
| author | Jan Kaluza <jkaluza@redhat.com> | 2013-11-01 12:43:40 +0100 |
|---|---|---|
| committer | Jan Kaluza <jkaluza@redhat.com> | 2013-11-01 12:43:40 +0100 |
| commit | 51fe77bc1f4de5a7c1c3a8adb0061210c32ec9e4 (patch) | |
| tree | b46c3f69c016d306d169356162ec625e1691f146 | |
| parent | 8de85ede524667039767771fd54140995d4cad7f (diff) | |
| download | httpd-51fe77bc1f4de5a7c1c3a8adb0061210c32ec9e4.tar.gz httpd-51fe77bc1f4de5a7c1c3a8adb0061210c32ec9e4.tar.xz httpd-51fe77bc1f4de5a7c1c3a8adb0061210c32ec9e4.zip | |
systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg
| -rw-r--r-- | httpd.service | 2 | ||||
| -rw-r--r-- | httpd.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/httpd.service b/httpd.service index 2dc16b9..04c43e2 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=/bin/kill -WINCH $MAINPID +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 @@ -14,7 +14,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.6 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -623,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Fir Nov 1 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.6-7 +- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg + * Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-6 - mod_ssl: allow SSLEngine to override Listen-based default (r1537535) |