rpms/dovecot/devel dovecot.init,1.4,1.5 dovecot.spec,1.104,1.105

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12892

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



Index: dovecot.init
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dovecot.init	21 May 2008 12:39:41 -0000	1.4
+++ dovecot.init	18 Jun 2008 12:41:41 -0000	1.5
@@ -8,6 +8,7 @@
 # description: Dovecot Imap Server
 # processname: dovecot
 # config: /etc/dovecot.conf
+# pidfile: /var/run/dovecot/master.pid
 
 ### BEGIN INIT INFO
 # Provides: dovecot
@@ -28,23 +29,34 @@
 
 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 /usr/sbin/dovecot ] || exit 5
-	[ -f /etc/dovecot.conf ] || exit 6
+	[ -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
 }
 
@@ -58,23 +70,26 @@
   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}"
+	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
 	exit 2
 esac
 


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- dovecot.spec	6 Jun 2008 16:29:09 -0000	1.104
+++ dovecot.spec	18 Jun 2008 12:41:41 -0000	1.105
@@ -2,7 +2,7 @@
 Name: dovecot
 Epoch: 1
 Version: 1.0.14
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -388,6 +388,9 @@
 
 
 %changelog
+* Wed Jun 18 2008 Dan Horak <dan[at]danny.cz> - 1:1.0.14-4
+- update init script (Resolves: #451838)
+
 * Fri Jun  6 2008 Dan Horak <dan[at]danny.cz> - 1:1.0.14-3
 - build devel subpackage (Resolves: #306881)