rpms/dovecot/F-9 dovecot.init,1.3,1.4 dovecot.spec,1.101,1.102

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/dovecot/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21334

Modified Files:
	dovecot.init dovecot.spec 
Log Message:
* Wed Jun 18 2008 Dan Horak <dan[at]danny.cz> - 1:1.0.14-9
- update init script (Resolves: #451838)



Index: dovecot.init
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dovecot.init	5 Jan 2005 21:42:51 -0000	1.3
+++ dovecot.init	18 Jun 2008 13:15:08 -0000	1.4
@@ -7,27 +7,56 @@
 # chkconfig: - 65 35
 # description: Dovecot Imap Server
 # processname: dovecot
+# config: /etc/dovecot.conf
+# pidfile: /var/run/dovecot/master.pid
+
+### BEGIN INIT INFO
+# Provides: dovecot
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: $remote_fs
+# Should-Stop: $remote_fs
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop Dovecot Imap server
+# Description: Dovecot is an IMAP server for Linux/UNIX-like systems,
+#              written with security primarily in mind.  It also contains
+#              a small POP3 server.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 
-test -x /usr/sbin/dovecot || exit 0
-
 RETVAL=0
 prog="Dovecot Imap"
+exec="/usr/sbin/dovecot"
+config="/etc/dovecot.conf"
+pidfile="/var/run/dovecot/master.pid"
+lockfile="/var/lock/subsys/dovecot"
 
 start() {
+	[ -x $exec ] || exit 5
+	[ -f $config ] || exit 6
+
         echo -n $"Starting $prog: "
-	daemon /usr/sbin/dovecot
+	daemon --pidfile $pidfile $exec
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dovecot
+	[ $RETVAL -eq 0 ] && touch  $lockfile
 	echo
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc /usr/sbin/dovecot
+	killproc -p $pidfile $exec
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	echo
+}
+
+reload() {
+	echo -n $"Reloading $prog: "
+	killproc -p $pidfile $exec -HUP
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dovecot
 	echo
 }
 
@@ -41,24 +70,27 @@
   stop)
 	stop
 	;;
-  reload|restart)
+  reload)
+	reload
+	;;
+  force-reload|restart)
 	stop
 	start
 	RETVAL=$?
 	;;
-  condrestart)
-	if [ -f /var/lock/subsys/dovecot ]; then
+  condrestart|try-restart)
+	if [ -f $lockfile ]; then
 	    stop
 	    start
 	fi
 	;;
   status)
-	status /usr/sbin/dovecot
+	status -p $pidfile $exec
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {condrestart|start|stop|restart|reload|status}"
-	exit 1
+	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
+	exit 2
 esac
 
 exit $RETVAL


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/F-9/dovecot.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- dovecot.spec	7 Jun 2008 11:28:11 -0000	1.101
+++ dovecot.spec	18 Jun 2008 13:15:08 -0000	1.102
@@ -3,7 +3,7 @@
 %define upstream 1.0.14
 %define sieve_upstream 1.0.3
 %define pkg_version 1.0.14
-%define my_release 8
+%define my_release 9
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.3
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -430,6 +430,9 @@
 
 
 %changelog
+* Wed Jun 18 2008 Dan Horak <dan[at]danny.cz> - 1:1.0.14-9
+- update init script (Resolves: #451838)
+
 * Sat Jun 07 2008 Dan Horak <dan[at]danny.cz> - 1:1.0.14-8
 - build devel subpackage (Resolves: #306881)