httpd-2.4.3-apctl-systemd.patch 1.1 KB

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