Raphaël G. Git Repositories - ihttpd/blob - SOURCES/httpd-2.4.3-apctl-systemd.patch

   1
   2 Upstream-Status: vendor specific patch
   3
   4 diff --git a/support/apachectl.in b/support/apachectl.in
   5 index c6ac3ea..2599386 100644
   6 --- a/support/apachectl.in
   7 +++ b/support/apachectl.in
   8 @@ -100,9 +100,24 @@ fi
   9  ERROR=$?
  10  }
  11
  12 +if [ "x$2" != "x" ] ; then
  13 +    echo Passing arguments to httpd using apachectl is no longer supported.
  14 +    echo You can only start/stop/restart httpd using this script.
  15 +    echo If you want to pass extra arguments to httpd, edit the
  16 +    echo /etc/sysconfig/httpd config file.
  17 +fi
  18 +
  19  case $ACMD in
  20 -start|stop|restart|graceful|graceful-stop)
  21 -    $HTTPD $OPTIONS -k $ARGV
  22 +start|stop|restart|status)
  23 +    /usr/bin/systemctl $ACMD httpd.service
  24 +    ERROR=$?
  25 +    ;;
  26 +graceful)
  27 +    /usr/bin/systemctl reload httpd.service
  28 +    ERROR=$?
  29 +    ;;
  30 +graceful-stop)
  31 +    /usr/bin/systemctl stop httpd.service
  32      ERROR=$?
  33      ;;
  34  startssl|sslstart|start-SSL)
  35 @@ -114,10 +129,6 @@ startssl|sslstart|start-SSL)
  36  configtest)
  37      testconfig
  38      ;;
  39 -status)
  40 -    checklynx
  41 -    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
  42 -    ;;
  43  fullstatus)
  44      checklynx
  45      $LYNX $STATUSURL