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