diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-10-05 18:48:49 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-10-05 18:48:49 +0200 |
| commit | 3aad8e0ac5256cafbdaeaa17653e700ba8ead0a9 (patch) | |
| tree | 56a2c98235930abcc0d94f1261b6d2ee2b15f55b /httpd-2.4.3-apctl-systemd.patch | |
| parent | a28d244176270bc2881b6d48f9c41d3cb73108e4 (diff) | |
httpd: sync with rawhide
Diffstat (limited to 'httpd-2.4.3-apctl-systemd.patch')
| -rw-r--r-- | httpd-2.4.3-apctl-systemd.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/httpd-2.4.3-apctl-systemd.patch b/httpd-2.4.3-apctl-systemd.patch new file mode 100644 index 0000000..bcb57fe --- /dev/null +++ b/httpd-2.4.3-apctl-systemd.patch @@ -0,0 +1,45 @@ + +Upstream-Status: vendor specific patch + +diff --git a/support/apachectl.in b/support/apachectl.in +index c6ac3ea..2599386 100644 +--- a/support/apachectl.in ++++ b/support/apachectl.in +@@ -100,9 +100,24 @@ fi + ERROR=$? + } + ++if [ "x$2" != "x" ] ; then ++ echo Passing arguments to httpd using apachectl is no longer supported. ++ echo You can only start/stop/restart httpd using this script. ++ echo If you want to pass extra arguments to httpd, edit the ++ echo /etc/sysconfig/httpd config file. ++fi ++ + case $ACMD in +-start|stop|restart|graceful|graceful-stop) +- $HTTPD $OPTIONS -k $ARGV ++start|stop|restart|status) ++ /usr/bin/systemctl $ACMD httpd.service ++ ERROR=$? ++ ;; ++graceful) ++ /usr/bin/systemctl restart httpd.service ++ ERROR=$? ++ ;; ++graceful-stop) ++ /usr/bin/systemctl stop httpd.service + ERROR=$? + ;; + startssl|sslstart|start-SSL) +@@ -114,10 +129,6 @@ startssl|sslstart|start-SSL) + configtest) + testconfig + ;; +-status) +- checklynx +- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' +- ;; + fullstatus) + checklynx + $LYNX $STATUSURL |