diff options
| author | Jan Kaluza <hanzz.k@gmail.com> | 2012-10-01 09:17:09 +0200 |
|---|---|---|
| committer | Jan Kaluza <hanzz.k@gmail.com> | 2012-10-01 09:17:09 +0200 |
| commit | a62c50b2bed51e40a7f697199a6ab02bc166de69 (patch) | |
| tree | 0cb5c034394e38086dcb76aacf7fca5b9f78eca9 /httpd-2.4.3-apctl-systemd.patch | |
| parent | 0fdc382d61768fa42a68beb8508eac7f3681a20e (diff) | |
| download | httpd-a62c50b2bed51e40a7f697199a6ab02bc166de69.tar.gz httpd-a62c50b2bed51e40a7f697199a6ab02bc166de69.tar.xz httpd-a62c50b2bed51e40a7f697199a6ab02bc166de69.zip | |
use systemctl from apachectl (#842736)
Diffstat (limited to 'httpd-2.4.3-apctl-systemd.patch')
| -rw-r--r-- | httpd-2.4.3-apctl-systemd.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/httpd-2.4.3-apctl-systemd.patch b/httpd-2.4.3-apctl-systemd.patch new file mode 100644 index 0000000..013202a --- /dev/null +++ b/httpd-2.4.3-apctl-systemd.patch @@ -0,0 +1,42 @@ +diff --git a/support/apachectl.in b/support/apachectl.in +index c6ac3ea..2599386 100644 +--- a/support/apachectl.in ++++ b/support/apachectl.in +@@ -100,9 +100,24 @@ fi + ERROR=$? + } + ++if [ "x$2" != "x" ] ; then ++ echo Passing arguments to httpd using apachectl is no longer supported. ++ echo You can only start/stop/restart httpd using this script. ++ echo If you want to pass extra arguments to httpd, edit ++ echo /etc/sysconfig/httpd config file. ++fi ++ + case $ACMD in +-start|stop|restart|graceful|graceful-stop) +- $HTTPD $OPTIONS -k $ARGV ++start|stop|restart|status) ++ /usr/bin/systemctl $ACMD httpd.service ++ ERROR=$? ++ ;; ++graceful) ++ /usr/bin/systemctl restart httpd.service ++ ERROR=$? ++ ;; ++graceful-stop) ++ /usr/bin/systemctl stop httpd.service + ERROR=$? + ;; + startssl|sslstart|start-SSL) +@@ -114,10 +129,6 @@ startssl|sslstart|start-SSL) + configtest) + testconfig + ;; +-status) +- checklynx +- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' +- ;; + fullstatus) + checklynx + $LYNX $STATUSURL |