]> git.pld-linux.org Git - packages/lighttpd.git/blobdiff - lighttpd.init
describe more config params. taken from upstream config
[packages/lighttpd.git] / lighttpd.init
old mode 100644 (file)
new mode 100755 (executable)
index 85af622..aaf4d5f
 # Source function library
 . /etc/rc.d/init.d/functions
 
+upstart_controlled
+
 # Get network config
 . /etc/sysconfig/network
 
 # Get service config
 [ -f /etc/sysconfig/lighttpd ] && . /etc/sysconfig/lighttpd
 
+DAEMON=/usr/sbin/lighttpd
+ANGEL_DAEMON=/usr/sbin/lighttpd-angel
+CONFIGFILE=/etc/lighttpd/lighttpd.conf
+
 # 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 lighttpd
+               msg_network_down "Lighttpd Web Server"
                exit 1
        fi
 else
@@ -27,106 +33,192 @@ else
 fi
 
 configtest() {
-       out=`env SHELL=/bin/sh lighttpd -t -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS 2>&1`
-       rc=$?
-       if [ "$rc" = 0 ]; then
-               return
+       # check for deprecated config options that cause bad side effects
+       # TODO: should remove the deprecated options in pld after some time being warned out
+       local out
+       out=$(env SHELL=/bin/sh $DAEMON -f $CONFIGFILE $HTTPD_OPTS -p 2>&1 | grep -oE '(url.rewrite|url.rewrite-final)[[:space:]]')
+       if [ -n "$out" ]; then
+               # make it unique, format nicely
+               out=$(echo "$out" | sort -u | xargs | sed -e 's/ /, /g')
+               echo >&2 "WARNING: found deprecated '$out', convert to 'url.rewrite-final' recommented, See http://redmine.lighttpd.net/issues/2379"
+       fi
+
+       env SHELL=/bin/sh $DAEMON -t -f $CONFIGFILE $HTTPD_OPTS
+}
+
+# wrapper for configtest
+checkconfig() {
+       local details=${1:-0}
+
+       if [ $details = 1 ]; then
+               # run config test and display report (status action)
+               show "Checking %s configuration" "Lighttpd Web Server"; busy
+               local out
+               out=$(configtest 2>&1)
+               RETVAL=$?
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               [ "$out" ] && echo >&2 "$out"
+       else
+               # run config test and abort with nice message if failed
+               # (for actions checking status before action).
+               configtest >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL != 0 ]; then
+                       show "Checking %s configuration" "Lighttpd Web Server"; fail
+                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
+                       exit $RETVAL
+               fi
        fi
-       echo >&2 ""
-       echo >&2 "$out"
-       fail
 }
 
 start() {
-       daemon env SHELL=/bin/sh lighttpd -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/lighttpd ]; then
+               msg_already_running "Lighttpd Web Server"
+               return
+       fi
+
+       checkconfig
+       msg_starting "Lighttpd Web Server"; busy
+       if is_yes "${LIGHT_ANGEL}"; then
+               daemon --fork --pidfile /var/run/lighttpd-angel.pid --makepid \
+                       env SHELL=/bin/sh $ANGEL_DAEMON -D -f $CONFIGFILE $HTTPD_OPTS
+
+       else
+               env SHELL=/bin/sh $DAEMON -f $CONFIGFILE $HTTPD_OPTS
+       fi
        RETVAL=$?
-       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lighttpd
-       return $RETVAL
+       if [ $RETVAL -eq 0 ]; then
+               ok
+               touch /var/lock/subsys/lighttpd
+       else
+               fail
+       fi
 }
 
 stop() {
+       # Stop daemons.
+       if [ ! -f /var/lock/subsys/lighttpd ]; then
+               msg_not_running "Lighttpd Web Server"
+               return
+       fi
+
+       msg_stopping "Lighttpd Web Server"
        killproc --pidfile /var/run/lighttpd.pid lighttpd
        rm -f /var/lock/subsys/lighttpd >/dev/null 2>&1
+       rm -f /var/run/lighttpd*.pid >/dev/null 2>&1
+}
+
+restart() {
+       local pid
+
+       # short circuit to safe reload if pid exists and is alive
+       if is_yes "${LIGHT_ANGEL}"; then
+               if [ -f /var/lock/subsys/lighttpd ] && pid=$(pidofproc lighttpd-angel lighttpd-angel.pid) && checkpid $pid; then
+                       reload
+                       return
+               fi
+       else
+               if [ -f /var/lock/subsys/lighttpd ] && pid=$(pidofproc lighttpd lighttpd.pid) && checkpid $pid; then
+                       reload
+                       return
+               fi
+       fi
+
+       checkconfig
+       stop
+       start
 }
 
 reload() {
-       # sending INT signal will make lighttpd close all listening sockets and
-       # wait for client connections to terminate.
-       killproc --pidfile /var/run/lighttpd.pid lighttpd -INT
-       env SHELL=/bin/sh lighttpd -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
+       # TODO: check if process is running. Start it in this case.
+       if [ ! -f /var/lock/subsys/lighttpd ]; then
+               msg_not_running "Lighttpd Web Server"
+               RETVAL=7
+               return
+       fi
+
+       checkconfig 1
+       msg_reloading "Lighttpd Web Server"
+
+       if is_yes "${LIGHT_ANGEL}"; then
+               # sending HUP signal to angel will make lighttpd close all listening
+               # sockets and wait for client connections to terminate. After that new
+               # child will be started
+               killproc lighttpd-angel -HUP
+       else
+               # sending INT signal will make lighttpd close all listening sockets and
+               # wait for client connections to terminate.
+               killproc --pidfile /var/run/lighttpd.pid lighttpd -INT
+               env SHELL=/bin/sh lighttpd -f $CONFIGFILE $HTTPD_OPTS
+       fi
+       RETVAL=$?
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/lighttpd ]; then
+               msg_not_running "Lighttpd Web Server"
+               RETVAL=$1
+               return
+       fi
+
+       checkconfig
+       stop
+       start
+}
+
+flush-logs() {
+       if [ ! -f /var/lock/subsys/lighttpd ]; then
+               msg_not_running "Lighttpd Web Server"
+               RETVAL=7
+               return
+       fi
+
+       show "Rotating %s logs" lighttpd
+       # send HUP to main lighttpd (not angel) process to rotate logs:
+       killproc --pidfile /var/run/lighttpd.pid lighttpd -HUP
+       RETVAL=$?
 }
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/lighttpd ]; then
-               msg_starting lighttpd
-               configtest || exit 1
-               start
-       else
-               msg_already_running lighttpd
-       fi
+       start
        ;;
   stop)
-       # Stop daemons.
-       if [ -f /var/lock/subsys/lighttpd ]; then
-               msg_stopping lighttpd
-               stop
-       else
-               msg_not_running lighttpd
-       fi
-       ;;
-  status)
-       status lighttpd
-       RETVAL=$?
+       stop
        ;;
   restart)
-       if [ -f /var/lock/subsys/lighttpd ]; then
-               configtest || exit 1
-
-               # short circuit to safe reload if pid exists and is alive
-               pid=$(pidofproc lighttpd lighttpd.pid)
-               if [ "$pid" ] && checkpid $pid; then
-                       msg_reloading lighttpd
-                       reload
-               else
-                       msg_stopping lighttpd
-                       stop
-                       msg_starting lighttpd
-                       start
-               fi
-               RETVAL=$?
-       else
-               msg_not_running lighttpd
-               msg_starting lighttpd
-               start
-       fi
+       restart
        ;;
-  reload|graceful|force-reload)
-       if [ -f /var/lock/subsys/lighttpd ]; then
-               msg_reloading lighttpd
-               configtest || exit 1
-               reload
-               RETVAL=$?
-       else
-               msg_not_running lighttpd
-               RETVAL=7
-       fi
+  try-restart)
+       condrestart 0
+       ;;
+  reload|force-reload|graceful)
+       reload
        ;;
   flush-logs)
-       if [ -f /var/lock/subsys/lighttpd ]; then
-               nls "Rotating %s logs" lighttpd
-               killproc --pidfile /var/run/lighttpd.pid lighttpd -HUP
-               RETVAL=$?
-       else
-               msg_not_running lighttpd
-               RETVAL=7
+       flush-logs
+       ;;
+  checkconfig|configtest)
+       checkconfig 1
+       ;;
+  show-config)
+       env SHELL=/bin/sh $DAEMON -p -f $CONFIGFILE $HTTPD_OPTS
+       ;;
+  status)
+       if is_yes "${LIGHT_ANGEL}"; then
+               status lighttpd-angel || RETVAL=$?
        fi
+       status lighttpd || RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|flush-logs|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|configtest|flush-logs|show-config|status}"
        exit 3
        ;;
 esac
This page took 0.077075 seconds and 4 git commands to generate.