[pkg-kolab] r469 - kolabd/trunk/debian

Peter Eisentraut petere at costa.debian.org
Mon Sep 25 15:26:29 UTC 2006


Author: petere
Date: 2006-09-25 15:26:29 +0000 (Mon, 25 Sep 2006)
New Revision: 469

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/kolabd.init
Log:
* Enhanced init script

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2006-09-25 13:14:41 UTC (rev 468)
+++ kolabd/trunk/debian/changelog	2006-09-25 15:26:29 UTC (rev 469)
@@ -2,8 +2,9 @@
 
   * Added version number to lsb-base dependency
   * Restricted permissions on configuration files containing passwords
+  * Enhanced init script
 
- -- Peter Eisentraut <petere at debian.org>  Mon, 25 Sep 2006 15:11:19 +0200
+ -- Peter Eisentraut <petere at debian.org>  Mon, 25 Sep 2006 15:13:20 +0200
 
 kolabd (1.9.4-20060707.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/kolabd.init
===================================================================
--- kolabd/trunk/debian/kolabd.init	2006-09-25 13:14:41 UTC (rev 468)
+++ kolabd/trunk/debian/kolabd.init	2006-09-25 15:26:29 UTC (rev 469)
@@ -1,50 +1,55 @@
 #!/bin/sh
-#
-# start/stop kolab server.
 
-if ! [ -x /usr/sbin/kolabd ]; then
-	exit 0
+### BEGIN INIT INFO
+# Provides:          kolabd
+# Required-Start:    $local_fs $remote_fs $network $syslog slapd postfix apache2 saslauthd kolab-cyrus-common
+# Required-Stop:     $local_fs $remote_fs $network $syslog slapd postfix apache2 saslauthd kolab-cyrus-common
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start Kolab server
+### END INIT INFO
+
+if [ ! -x /usr/sbin/kolabd ]; then
+	exit 5
 fi
 
-KOLABPID=/var/run/kolab.pid
+DAEMON=/usr/sbin/kolabd
+PIDFILE=/var/run/kolab.pid
 
 . /lib/lsb/init-functions
 
-case "$1" in
+case $1 in
     start)
-	log_daemon_msg "Starting Kolab daemons" "kolabd"
-
-	if ! start-stop-daemon --start --quiet --oknodo --background --exec /usr/sbin/kolabd; then
-		log_end_msg 1
-		exit 1
-	fi
-
-	log_end_msg 0
+	log_daemon_msg "Starting Kolab server" "kolabd"
+	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --background --startas $DAEMON
+	log_end_msg $?
 	;;
     stop)
-	log_daemon_msg "Stopping Kolab daemons" "kolabd"
-
-	start-stop-daemon --stop --quiet --pidfile $KOLABPID
-
-	log_end_msg 0
+	log_daemon_msg "Stopping Kolab server" "kolabd"
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+	rm -f $PIDFILE
+	log_end_msg $?
 	;;
-    reload)
-	log_daemon_msg "Reloading Kolab daemons" "kolabd"
-
-	start-stop-daemon --stop --signal HUP --pidfile $KOLABPID
-
-	log_end_msg 0
+    reload|force-reload)
+	log_daemon_msg "Reloading Kolab server" "kolabd"
+	start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE
+	log_end_msg $?
 	;;
-    restart|force-reload)
-	$0 stop
-	sleep 1
-	$0 start
-
+    restart)
+	$0 stop && sleep 1 && $0 start
 	;;
+    status)
+	pidofproc -p $PIDFILE $DAEMON >/dev/null
+	status=$?
+	if [ $status -eq 0 ]; then
+		log_success_msg "Kolab server is running."
+	else
+		log_failure_msg "Kolab server is not running."
+	fi
+	exit $status
+	;;
     *)
-	echo "Usage: /etc/init.d/kolabd {start|stop|reload|force-reload|restart}"
-	exit 1
+	echo "Usage: $0 {start|stop|reload|force-reload|restart|status}"
+	exit 2
 	;;
 esac
-
-exit 0




More information about the pkg-kolab-devel mailing list