X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=postfix.init;h=c44be2f67004641c112efc5927f2727d7c4c410d;hb=6924b882fbfa0e3a08032410d3b039ebf599a381;hp=dd9f1d42a4b9f4efad4770c0fc085ab171e68502;hpb=ceec68da17696916773136a8ae4dc02503b08a31;p=packages%2Fpostfix.git

diff --git a/postfix.init b/postfix.init
index dd9f1d4..c44be2f 100644
--- a/postfix.init
+++ b/postfix.init
@@ -3,9 +3,9 @@
 # postfix	This shell script takes care of starting and stopping
 #		postfix.
 #
-# chkconfig:	345 80 30
+# chkconfig:	345 80 20
 #
-# description:	Postfix is a Mail Transport Agent, which is the program
+# description:	Postfix is a Mail Transport Agent, which is the program \
 #		that moves mail from one machine to another.
 
 
@@ -19,85 +19,119 @@
 [ -f /etc/sysconfig/postfix ] && . /etc/sysconfig/postfix
 
 # Check that networking is up.
-if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down Postfix
-		exit 1
+networking_check() {
+	if is_yes "${NETWORKING}"; then
+		if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+			msg_network_down "Postfix"
+			exit 1
+		fi
+	else
+		exit 0
+	fi
+}
+
+start() {
+	if [ -f /var/lock/subsys/postfix ]; then
+		msg_already_running "Postfix"
+		return
+	fi
+
+	local msg
+	msg_starting "Postfix"
+	busy
+	_daemon_set_ulimits
+	msg=$(nice -n ${SERVICE_RUN_NICE_LEVEL:-${DEFAULT_SERVICE_RUN_NICE_LEVEL:-0}} /usr/sbin/postfix start 2>&1)
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		ok
+		touch /var/lock/subsys/postfix
+	else
+		fail
+		echo >&2 "$msg"
+	fi
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/postfix ]; then
+		msg_not_running "Postfix"
+		return
 	fi
-else
-	exit 0
-fi
+
+	local msg
+	msg_stopping "Postfix"
+	busy
+	msg=$(/usr/sbin/postfix stop 2>&1)
+	if [ $? -eq 0 ]; then
+		ok
+	else
+		fail
+		echo >&2 "$msg"
+	fi
+	rm -f /var/lock/subsys/postfix >/dev/null 2>&1
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/postfix ]; then
+		msg_not_running "Postfix"
+		RETVAL=7
+		return
+	fi
+
+	local msg
+	msg_reloading "Postfix"
+	busy
+	msg=$(/usr/sbin/postfix reload 2>&1)
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		ok
+	else
+		fail
+		echo >&2 "$msg"
+		RETVAL=7
+	fi
+}
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/postfix ]; then
-		msg_starting Postfix
-		busy
-		MSG="`/usr/sbin/postfix start 2>&1`"
-		if [ $? -eq 0 ]; then
-			ok
-			touch /var/lock/subsys/postfix
-		else
-			RETVAL=1
-			fail
-			echo "$MSG"
-		fi
-	else
-		msg_already_running Postfix
-	fi
+  	networking_check
+	start
 	;;
   stop)
-	# Stop daemons.
-	if [ -f /var/lock/subsys/postfix ]; then
-		msg_stopping Postfix
-		busy
-		MSG="`/usr/sbin/postfix stop 2>&1`"
-		if [ $? -eq 0 ]; then
-			ok
-		else
-			fail
-			echo "$MSG"
-		fi
-		rm -f /var/lock/subsys/postfix
-	else
-		msg_not_running Postfix
-	fi
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+  	networking_check
+	stop
+	start
 	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/postfix ]; then
-		msg_reloading Postfix
-		busy
-		/usr/sbin/postfix reload
-		RETVAL=$?
-		[ $RETVAL -ne 0 ] && RETVAL=7
-		[ $RETVAL -eq 0 ] && ok || died
-	else
-		msg_not_running Postfix >&2
-		exit 7
-	fi
-	;;
-  status)
-	status master
-	exit $?
+  	networking_check
+	reload
 	;;
   rebuilddb)
 	standard_db="access canonical relocated transport virtual"
-	extra_db=$(ls -1 /etc/mail/*.db 2> /dev/null | grep -v aliases.db | sed -e 's#.db$##')
+	extra_db=$(ls -1 /etc/mail/*.db 2> /dev/null | grep -Ev '/(access|canonical|relocated|transport|virtual|aliases)\.db$')
+
+	echo -n "Rebuilding databases: "
 	for base in $standard_db $extra_db; do
-		I=$(basename "$base")
-		if [ -f /etc/mail/$I ]; then
-			/usr/sbin/postmap hash:/etc/mail/$I < /etc/mail/$I
+		db=$(basename "$base" .db)
+
+		if [ -f /etc/mail/$db ]; then
+			echo -n "$db "
+			/usr/sbin/postmap hash:/etc/mail/$db < /etc/mail/$db
 		fi
 	done
+	echo "...DONE"
+
+	echo -n "Rebuilding aliases database"
 	/usr/bin/newaliases
+	echo "...DONE"
+	;;
+  status)
+	status master
+	exit $?
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|rebuilddb|status}"