X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache.init;h=145eef89e92eca7db042b8e2e0bba1fb938492a1;hb=0226390ad764c020d9a97bc7d89c822775d970c8;hp=0afc17176493fa6b2d758a1a3069126c716d92e6;hpb=912b10b644ea84ba6f15255efa6696897bd6dfe9;p=packages%2Fapache.git

diff --git a/apache.init b/apache.init
index 0afc171..145eef8 100644
--- a/apache.init
+++ b/apache.init
@@ -22,37 +22,64 @@
 [ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # Check that networking is up.
-[ "${NETWORKING}" = "no" ] && echo "Error: Networking is down" && exit 0
-
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		# nls "ERROR: Networking is down. %s can't be run." <service>
+		msg_network_down httpd
+		exit 1
+	fi
+else
+	exit 0
+fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/httpd ]; then
-		show Starting httpd
-		daemon httpd
+		msg_starting httpd
+		daemon httpd $HTTPD_OPTS
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
 	else
-		echo "httpd already is running"
+		msg_already_running httpd
 	fi
-	touch /var/lock/subsys/httpd
 	;;
   stop)
-	show Shutting down httpd
-	killproc httpd  
-	rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc*
+	# Stop daemons.
+	if [ -f /var/lock/subsys/httpd ]; then
+		msg_stopping httpd
+		killproc httpd
+		rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
+	else
+		msg_not_running httpd
+	fi
 	;;
   status)
 	status httpd
+	RETVAL=$?
+	/usr/sbin/httpd -S
 	;;
-  restart|reload)
+  restart)
 	$0 stop
 	$0 start
+	exit $?
+	;;
+  reload|force-reload)
+	if [ -f /var/lock/subsys/httpd ]; then
+		msg_reloading httpd
+		killproc httpd -HUP
+		RETVAL=$?
+	else
+		msg_not_running httpd >&2
+		RETVAL=7
+	fi
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 	;;
 esac
 
-exit 0
+exit $RETVAL