Use ps -ef; ps -el truncates too much of the process name.

[moira.git] / gen / mailhub.sh

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index 3f9c55454fc71e1691d50ca54d1c1025c61d470b..0562c9b1f65de9842619f56793036c12bd7f2dcd 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -1,24 +1,36 @@
 #!/bin/sh
 PATH=/bin:/usr/ucb:/usr/bin
+root=/usr/local/sendmail
 
 MR_MKCRED=47836474
 
-cat /usr/lib/local-aliases >> /usr/lib/aliases.new
-cp /dev/null /usr/lib/aliases.new.dir
-cp /dev/null /usr/lib/aliases.new.pag
-/usr/lib/sendmail -bi -oA/usr/lib/aliases.new
+cat $root/etc/aliases.legacy > $root/etc/aliases.tmp
+cat $root/etc/aliases.new >> $root/etc/aliases.tmp
+cat $root/etc/aliases.local >> $root/etc/aliases.tmp
+mv $root/etc/aliases.tmp $root/etc/aliases.new
+
+cp /dev/null $root/etc/aliases.new.db
+
+$root/sbin/sendmail -bi -oA$root/etc/aliases.new
 if [ $? != 0 ]; then
        exit $MR_MKCRED
-       fi
-
-kill `ps ax | grep "accepting connections" | grep -v grep | awk '{print $1}'`
-mv /usr/lib/aliases /usr/lib/aliases.old
-mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
-mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
-mv /usr/lib/aliases.new /usr/lib/aliases
-mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
-mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
-/usr/lib/sendmail -bd -q30m
+fi
+
+kill `ps -ef | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $2}'`
+sleep 60
+
+mv $root/etc/aliases $root/etc/aliases.old
+mv $root/etc/aliases.db $root/etc/aliases.old.db
+mv $root/etc/aliases.new $root/etc/aliases
+mv $root/etc/aliases.new.db $root/etc/aliases.db
+
+cd /usr/spool/mqueue
+rm -f xf* tf* lf* nf*
+
+#$root/sbin/sendmail -bd
+#$root/sbin/sendmail -q20m
+
+sh /etc/init.d/sendmail start
 
 rm -f $0
 exit 0