printng.gen, the print DCM for LPRng servers. Will be merged back into

[moira.git] / gen / mailhub.sh

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index 3f9c55454fc71e1691d50ca54d1c1025c61d470b..4509b7b2cad9008ec20d0be83af3d5b171e20836 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -3,22 +3,34 @@ PATH=/bin:/usr/ucb:/usr/bin
 
 MR_MKCRED=47836474
 
-cat /usr/lib/local-aliases >> /usr/lib/aliases.new
+cat /usr/lib/aliases.legacy > /usr/lib/aliases.tmp
+cat /usr/lib/aliases.new >> /usr/lib/aliases.tmp
+cat /usr/lib/aliases.local >> /usr/lib/aliases.tmp
+mv aliases.tmp 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
 if [ $? != 0 ]; then
        exit $MR_MKCRED
        fi
 
-kill `ps ax | grep "accepting connections" | grep -v grep | awk '{print $1}'`
+kill `ps ax | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $1}'`
+sleep 60
+
 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
+
+cd /usr/spool/mqueue
+rm -f xf* tf* lf* nf*
+
+/usr/lib/sendmail -bd
+/usr/lib/sendmail -q20m
 
 rm -f $0
 exit 0