summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/apache/httpd
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-09-21 04:27:42 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-09-21 04:27:42 (GMT)
commit5706e2ebac725903ee04569920efdc475a23aa8f (patch)
treeadaf8f3fccd7d1b728b47e4ebe6a75b71a925c5c /abs/core-testing/apache/httpd
parentfefb747730dc79412a1a18b33a69e2b089b28f7e (diff)
downloadlinhes_pkgbuild-5706e2ebac725903ee04569920efdc475a23aa8f.zip
linhes_pkgbuild-5706e2ebac725903ee04569920efdc475a23aa8f.tar.gz
linhes_pkgbuild-5706e2ebac725903ee04569920efdc475a23aa8f.tar.bz2
apache: updated to latest arch version. Needed by svn
Diffstat (limited to 'abs/core-testing/apache/httpd')
-rwxr-xr-xabs/core-testing/apache/httpd65
1 files changed, 45 insertions, 20 deletions
diff --git a/abs/core-testing/apache/httpd b/abs/core-testing/apache/httpd
index da4de25..6fa9c3c 100755
--- a/abs/core-testing/apache/httpd
+++ b/abs/core-testing/apache/httpd
@@ -1,40 +1,65 @@
#!/bin/bash
-# general config
+daemon_name=httpd
+
. /etc/rc.conf
. /etc/rc.d/functions
+APACHECTL=/usr/sbin/apachectl
+
case "$1" in
start)
- stat_busy "Starting HTTP Daemon"
- /usr/sbin/apachectl start &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon httpd
+ stat_busy "Starting Apache Web Server"
+ [ ! -d /var/run/httpd ] && install -d /var/run/httpd
+ if $APACHECTL start >/dev/null ; then
+ add_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
+
stop)
- stat_busy "Stopping HTTP Daemon"
- /usr/sbin/apachectl stop &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
+ stat_busy "Stopping Apache Web Server"
+ if $APACHECTL stop >/dev/null ; then
+ rm_daemon $daemon_name
+ stat_done
else
- rm_daemon httpd
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ reload)
+ stat_busy "Reloading Apache Web Server"
+ if $APACHECTL graceful >/dev/null ; then
+ add_daemon $daemon_name
stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
+
restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- reload)
- if [ -f /var/run/httpd/httpd.pid ]; then
- status "Reloading HTTP Configuration" kill -HUP `cat /var/run/httpd/httpd.pid`
+ stat_busy "Restarting Apache Web Server"
+ if $APACHECTL restart >/dev/null ; then
+ add_daemon $daemon_name
+ stat_done
+ else
+ stat_fail
+ exit 1
fi
;;
+
+ status)
+ stat_busy "Checking Apache Web Server status";
+ ck_status $daemon_name
+ ;;
+
*)
- echo "usage: $0 {start|stop|restart|reload}"
+ echo "usage: $0 {start|stop|reload|restart|status}"
esac
+
+exit 0