- cosmetics

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 14d4307f4368d021f6b26e2357540a6764ad8118..0432b79a7725dffdd4d6f4521d69ce8b6f11622e 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -7,9 +7,7 @@
 #              HTML files and CGI.
 # processname: httpd
 # pidfile:     /var/run/httpd.pid
-# config:      /etc/httpd/conf/access.conf
-# config:      /etc/httpd/conf/httpd.conf
-# config:      /etc/httpd/conf/srm.conf
+# config:      /etc/httpd/httpd.conf
 
 
 # Source function library
@@ -24,10 +22,13 @@
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
         # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_Network_Down httpd
+        msg_network_down httpd
         exit 1
 fi
-                       
+
+if is_no "${IPV6_NETWORKING}"; then
+        HTTPD_OPTS="$HTTPD_OPTS -4"
+fi
 
 # See how we were called.
 case "$1" in
@@ -35,11 +36,11 @@ case "$1" in
        # Check if the service is already running?
         if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd
-               daemon httpd
+               daemon httpd $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_Already_Running httpd
+               msg_already_running httpd
                exit 1
        fi
        ;;
@@ -50,7 +51,7 @@ case "$1" in
                 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
+               msg_not_running httpd
                exit 1
        fi
        ;;
@@ -64,7 +65,7 @@ case "$1" in
        $0 start
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|status}"
        exit 1
        ;;
 esac