rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

have "apachectl graceful" start httpd if not running, per man page

Browse Source
This commit is contained in:
Joe Orton 2016-04-07 14:07:25 +01:00
parent a4064261ea
commit 37b82598ea
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
httpd-2.4.3-apctl-systemd.patch
View File

@ -1,11 +1,13 @@
Make apachectl run via systemctl.
Note: "apachectl graceful" is documented to start httpd if not running.
Upstream-Status: vendor specific patch Upstream-Status: vendor specific patch
diff --git a/support/apachectl.in b/support/apachectl.in --- httpd-2.4.18/support/apachectl.in.apctlsystemd
index c6ac3ea..2599386 100644 +++ httpd-2.4.18/support/apachectl.in
--- a/support/apachectl.in @@ -100,9 +100,28 @@ fi
+++ b/support/apachectl.in
@@ -100,9 +100,24 @@ fi
ERROR=$? ERROR=$?
} }
@ -24,7 +26,11 @@ index c6ac3ea..2599386 100644
+ ERROR=$? + ERROR=$?
+ ;; + ;;
+graceful) +graceful)
+ /usr/bin/systemctl reload httpd.service + if /usr/bin/systemctl -q is-active httpd.service; then
+ /usr/bin/systemctl reload httpd.service
+ else
+ /usr/bin/systemctl start httpd.service
+ fi
+ ERROR=$? + ERROR=$?
+ ;; + ;;
+graceful-stop) +graceful-stop)
@ -32,7 +38,7 @@ index c6ac3ea..2599386 100644
ERROR=$? ERROR=$?
;; ;;
startssl|sslstart|start-SSL) startssl|sslstart|start-SSL)
@@ -114,10 +129,6 @@ startssl|sslstart|start-SSL) @@ -114,10 +133,6 @@ startssl|sslstart|start-SSL)
configtest) configtest)
testconfig testconfig
;; ;;

5
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.18 Version: 2.4.18
Release: 5%{?dist} Release: 6%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -672,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Thu Apr 7 2016 Joe Orton <jorton@redhat.com> - 2.4.18-6
- have "apachectl graceful" start httpd if not running, per man page
* Wed Apr 6 2016 Joe Orton <jorton@redhat.com> - 2.4.18-5 * Wed Apr 6 2016 Joe Orton <jorton@redhat.com> - 2.4.18-5
- use redirects for lang-specific /manual/ URLs - use redirects for lang-specific /manual/ URLs