From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 2 Jan 2007 16:40:13 +0000 (+0000)
Subject: * cleanup init scripts
X-Git-Tag: v7.86~3719
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b6bb9a68e4e793aa8159ee99c9b6afc57b0c7f59

* cleanup init scripts
---

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index b65750132..866d57ff9 100644
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -1,23 +1,14 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          skeleton
+# Provides:          citadel-server
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
+# Short-Description: Citadel initscript
 ### END INIT INFO
 
-# Author: Foo Bar <foobar@baz.org>
-#
-# Please remove the "Author" lines above and replace them
-# with your own name if you copy and modify this script.
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
+# Author: Wilfried Goesgens <citadel@outgesourced.org>
 RUNDIR=/var/run/citadel
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware "
@@ -35,6 +26,7 @@ SENDCOMMAND=/usr/sbin/sendcommand
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
+# check if we 've got a newer system, so we can do fancy colors and so on.
 MODERN=
 
 # Load the VERBOSE setting and other rcS variables
@@ -68,9 +60,6 @@ do_start()
 	else
 	    return 2
 	fi
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
 }
 
 #
@@ -96,36 +85,12 @@ do_stop()
 	    return 2
 	fi
 
-	#while test -d /proc/`cat $PIDFILE`; do
-	#    /usr/bin/printf  '.'
-	#    /bin/sleep 1
-	#done
- 
-	#start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	#RETVAL="$?"
-	#[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	#start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	#[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	# rm -f $PIDFILE
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-#	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
         do_stop
         do_start
 	return 0
@@ -161,20 +126,7 @@ case "$1" in
 	    esac
 	fi
 	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
   restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
 	if test -n "$MODERN"; then
 	    log_daemon_msg "Restarting $DESC" "$NAME"
 	else
@@ -203,8 +155,7 @@ case "$1" in
 	fi
 	;;
   *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
 	exit 3
 	;;
 esac