- mod_deflate: compress application/javascript and application/x-javascript

[packages/apache.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index 8ea17174cd7a51ab20d54104fff4ff56acda9f43..8fda4d0c74764c3a91b1a04fac27f0739f8c8630 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -22,7 +22,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down apache
+               msg_network_down "Apache 1.3 Web Server"
                exit 1
        fi
 else
@@ -34,7 +34,7 @@ if is_no "${IPV6_NETWORKING}"; then
 fi
 
 configtest() {
-       apache -t > /dev/null 2>&1
+       /usr/sbin/apache -t > /dev/null 2>&1
        RETVAL=$?
 }
 
@@ -42,40 +42,40 @@ start() {
        # Check if the service is already running?
        if [ -x /usr/lib/apache1/lingerd ]; then
                if [ ! -f /var/lock/subsys/lingerd ]; then
-                       msg_starting lingerd
+                       msg_starting "Apache Lingerd"
                        SERVICE_UMASK=002 daemon --user http /usr/lib/apache1/lingerd
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lingerd
                else
-                       msg_already_running lingerd
+                       msg_already_running "Apache Lingerd"
                fi
        fi
        if [ ! -f /var/lock/subsys/apache ]; then
-               msg_starting apache
-               daemon apache $HTTPD_OPTS
+               msg_starting "Apache 1.3 Web Server"
+               daemon /usr/sbin/apache $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
        else
-               msg_already_running apache
+               msg_already_running "Apache 1.3 Web Server"
        fi
 }
 
 stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/apache ]; then
-               msg_stopping apache
-               killproc apache
+               msg_stopping "Apache 1.3 Web Server"
+               killproc --pidfile /var/run/apache.pid apache
                rm -f /var/lock/subsys/apache /var/run/apache.pid /var/run/apache.loc* >/dev/null 2>&1
        else
-               msg_not_running apache
+               msg_not_running "Apache 1.3 Web Server"
        fi
        if [ -x /usr/lib/apache1/lingerd ]; then
                if [ -f /var/lock/subsys/lingerd ]; then
-                       msg_stopping lingerd
+                       msg_stopping "Apache Lingerd"
                        /usr/lib/apache1/lingerd -k && ok || fail
                        rm -f /var/lock/subsys/lingerd >/dev/null 2>&1
                else
-                       msg_not_running lingerd
+                       msg_not_running "Apache Lingerd"
                fi
        fi
 }
@@ -87,26 +87,26 @@ restart() {
                start
        else
                fail
-               echo >&2 "Configuration file syntax test failed."
+               echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
        fi
 }
 
 reload() {
-       sig=${1:-HUP}
-       retnr=${2:-7}
+       local sig=${1:-HUP}
+       local retnr=${2:-7}
        if [ -f /var/lock/subsys/apache ]; then
-               msg_reloading apache
+               msg_reloading "Apache 1.3 Web Server"
 
                configtest
                if [ $RETVAL -eq 0 ]; then
-                       killproc apache -$sig
+                       killproc --pidfile /var/run/apache.pid apache -$sig
                        RETVAL=$?
                else
                        fail
-                       echo >&2 "Configuration file syntax test failed."
+                       echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
                fi
        else
-               msg_not_running apache
+               msg_not_running "Apache 1.3 Web Server"
                RETVAL=$retnr
        fi
 }
@@ -120,11 +120,6 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status apache
-       RETVAL=$?
-       /usr/sbin/apache -S
-       ;;
   restart)
        restart
        ;;
@@ -132,7 +127,7 @@ case "$1" in
        if [ -f /var/lock/subsys/apache ]; then
                restart
        else
-               msg_not_running apache
+               msg_not_running "Apache 1.3 Web Server"
        fi
        ;;
   force-reload)
@@ -145,7 +140,12 @@ case "$1" in
        reload USR1 0
        ;;
   configtest)
-       apache -t
+       /usr/sbin/apache -t
+       ;;
+  status)
+       status apache
+       RETVAL=$?
+       /usr/sbin/apache -S
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"