# 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
fi
configtest() {
- env SHELL=/bin/sh lighttpd -t -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
+ # 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
# run config test and display report (status action)
show "Checking %s configuration" "Lighttpd Web Server"; busy
local out
- out=`configtest 2>&1`
+ out=$(configtest 2>&1)
RETVAL=$?
if [ $RETVAL = 0 ]; then
ok
checkconfig
msg_starting "Lighttpd Web Server"; busy
- env SHELL=/bin/sh lighttpd -f /etc/lighttpd/lighttpd.conf $HTTPD_OPTS
+ 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=$?
if [ $RETVAL -eq 0 ]; then
ok
- touch /var/lock/subsys/lighttpd
+ touch /var/lock/subsys/lighttpd
else
fail
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 [ -f /var/lock/subsys/lighttpd ] && pid=$(pidofproc lighttpd lighttpd.pid) && checkpid $pid; then
- reload
- return
+ 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
}
reload() {
+ # 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
+ checkconfig 1
msg_reloading "Lighttpd Web Server"
- # 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
+ 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=$?
}
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=$?
}
reload
;;
flush-logs)
- flush-logs
+ flush-logs
;;
checkconfig|configtest)
checkconfig 1
;;
+ show-config)
+ env SHELL=/bin/sh $DAEMON -p -f $CONFIGFILE $HTTPD_OPTS
+ ;;
status)
- status lighttpd
- RETVAL=$?
+ if is_yes "${LIGHT_ANGEL}"; then
+ status lighttpd-angel || RETVAL=$?
+ fi
+ status lighttpd || RETVAL=$?
;;
*)
- msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|configtest|flush-logs|status}"
+ msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|configtest|flush-logs|show-config|status}"
exit 3
;;
esac