arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone

Blame SOURCES/httpd-2.4.3-apctl-systemd.patch

28b219
28b219
Upstream-Status: vendor specific patch
28b219
28b219
diff --git a/support/apachectl.in b/support/apachectl.in
28b219
index c6ac3ea..2599386 100644
28b219
--- a/support/apachectl.in
28b219
+++ b/support/apachectl.in
28b219
@@ -100,9 +100,24 @@ fi
28b219
 ERROR=$?
28b219
 }
28b219
 
28b219
+if [ "x$2" != "x" ] ; then
28b219
+    echo Passing arguments to httpd using apachectl is no longer supported.
28b219
+    echo You can only start/stop/restart httpd using this script.
28b219
+    echo If you want to pass extra arguments to httpd, edit the
28b219
+    echo /etc/sysconfig/httpd config file.
28b219
+fi
28b219
+
28b219
 case $ACMD in
28b219
-start|stop|restart|graceful|graceful-stop)
28b219
-    $HTTPD $OPTIONS -k $ARGV
28b219
+start|stop|restart|status)
28b219
+    /usr/bin/systemctl $ACMD httpd.service
28b219
+    ERROR=$?
28b219
+    ;;
28b219
+graceful)
28b219
+    /usr/bin/systemctl reload httpd.service
28b219
+    ERROR=$?
28b219
+    ;;
28b219
+graceful-stop)
28b219
+    /usr/bin/systemctl stop httpd.service
28b219
     ERROR=$?
28b219
     ;;
28b219
 startssl|sslstart|start-SSL)
28b219
@@ -114,10 +129,6 @@ startssl|sslstart|start-SSL)
28b219
 configtest)
28b219
     testconfig
28b219
     ;;
28b219
-status)
28b219
-    checklynx
28b219
-    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
28b219
-    ;;
28b219
 fullstatus)
28b219
     checklynx
28b219
     $LYNX $STATUSURL