Merge branch 'feature/init-system-improvements'.

1 files changed, 9 insertions, 24 deletions

diff --git a/src.etc/init.d/httpd b/src.etc/init.d/httpd
index 1dc0d28..c26e151 100755
--- a/src.etc/init.d/httpd
+++ b/src.etc/init.d/httpd
@@ -1,32 +1,17 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+
+START='50'
+STOP='60'
 
 start()
 {
-	printf 'Starting httpd... '
-	start-stop-daemon -S -q -n httpd -x /usr/sbin/httpd -- -h /var/www
-	printf 'done.\n'
+	log 'Starting httpd'
+	start-stop-daemon -S -q -p /var/run/httpd.pid -m \
+		-x /usr/sbin/httpd -b -- -f -h /var/www
 }
 
 stop()
 {
-	printf 'Stopping httpd... '
-	start-stop-daemon -K -q -n httpd
-	printf 'done.\n'
+	log 'Stopping httpd'
+	start-stop-daemon -K -q -p /var/run/httpd.pid
 }
-
-case "${1}" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	*)
-		printf 'Usage: %s {start|stop|restart}\n' "${0}" >&2
-		exit 1
-		;;
-esac