File httpd-2.4.3-apctl-systemd.patch of Package httpd-2.4.39

File httpd-2.4.3-apctl-systemd.patch of Package httpd-2.4.39 (Revision d45dd604997b8a6038fb188b0e31b063)

Currently displaying revision d45dd604997b8a6038fb188b0e31b063, show latest

Make apachectl run via systemctl.

Note: "apachectl graceful" is documented to start httpd if not running.

Upstream-Status: vendor specific patch

--- httpd-2.4.18/support/apachectl.in.apctlsystemd
+++ httpd-2.4.18/support/apachectl.in
@@ -100,9 +100,28 @@ 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)
+    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=$?
+    ;;
+graceful-stop)
+    /usr/bin/systemctl stop httpd.service
     ERROR=$?
     ;;
 startssl|sslstart|start-SSL)
@@ -114,10 +133,6 @@ startssl|sslstart|start-SSL)
 configtest)
     testconfig
     ;;
-status)
-    checklynx
-    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
-    ;;
 fullstatus)
     checklynx
     $LYNX $STATUSURL