altarch-user / rpms / httpd

Forked from rpms/httpd 2 years ago
Clone

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

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