Changeset 24

Timestamp:

02/19/2005 03:55:47 PM (4 years ago)

Author:

jan

Message:

applied init.d patches for FC3 from Matthias Saou

• Add "$" to get strings translated
• Cleanup to look more like RH/FC init scripts
• Change S to 85 and K to 15, like apache
• Remove "on" from all runlevels by default
• Add "condrestart" support.

Files:

• doc/rc.lighttpd.redhat (modified) (3 diffs)

doc/rc.lighttpd.redhat

@@ -1 @@
-#! /bin/sh
-
-# lighttpd init file for redhat
+#!/bin/sh
 #
-# Tue Apr 9 2004 Matthijs van der Klip
+# lighttpd     Startup script for the lighttpd server
 #
-# chkconfig: 2345 99 01
-# description: Jan Kneschke's lighttpd
+# chkconfig: - 85 15
+# description: Lightning fast webserver with light system requirements
 #
-# processname: /usr/sbin/lighttpd
+# processname: lighttpd
 # config: /etc/lighttpd/lighttpd.conf
 # config: /etc/sysconfig/lighttpd
@@ -16 +14 @@
 # by lighttpd (config: server.pid-file).
 # If not, uncomment 'pidof' line.
-#
-# source function library
-. /etc/init.d/functions
 
+# Source function library
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/lighttpd ]; then
+        . /etc/sysconfig/lighttpd
+fi
+
+if [ -z "$LIGHTTPD_CONF_PATH" ]; then
+        LIGHTTPD_CONF_PATH="/etc/lighttpd/lighttpd.conf"
+fi
+
+prog="lighttpd"
+lighttpd="/usr/sbin/lighttpd"
 RETVAL=0
-prog="lighttpd"
-pidfile="/var/run/lighttpd.pid"
-LIGHTTPD_BIN=/usr/sbin/lighttpd
-LIGHTTPD_CONFIG=/etc/sysconfig/lighttpd
-. $LIGHTTPD_CONFIG
 
 start() {
-        echo -n "Starting $prog: "
-        daemon $LIGHTTPD_BIN -f $LIGHTTPD_CONF_PATH
+        echo -n $"Starting $prog: "
+        daemon $lighttpd -f $LIGHTTPD_CONF_PATH
         RETVAL=$?
         echo
-        touch /var/lock/subsys/$prog
-        #pidof $prog > $pidfile
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
         return $RETVAL
 }
 
 stop() {
-        echo -n "Stopping $prog: "
-        killproc $LIGHTTPD_BIN
+        echo -n $"Stopping $prog: "
+        killproc $lighttpd
         RETVAL=$?
         echo
-        rm -f /var/lock/subsys/$prog
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
         return $RETVAL
 }
 
 reload() {
-        echo -n "Reloading $prog: "
-        killproc $LIGHTTPD_BIN -HUP
+        echo -n $"Reloading $prog: "
+        killproc $lighttpd -HUP
         RETVAL=$?
         echo
@@ -65 +67 @@
                 start
                 ;;
+        condrestart)
+                if [ -f /var/lock/subsys/$prog ]; then
+                        stop
+                        start
+                fi
+                ;;
         reload)
                 reload
                 ;;
         status)
-                status $prog
+                status $lighttpd
                 RETVAL=$?
                 ;;
         *)
-                echo $"Usage: $0 {start|stop|restart|reload|status}"
+                echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}"
                 RETVAL=1
 esac