nmailhub service is now mailhub service.

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index cdee1bd99268ea64d3403fa35ffe75d50012395b..932524e4298c0258ea5c9552e1f0c12a2d67e542 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -1,42 +1,36 @@
 #!/bin/sh
 PATH=/bin:/usr/ucb:/usr/bin
-
-if [ -d /var/athena ] && [ -w /var/athena ]; then
-    exec >/var/athena/moira_update.log 2>&1
-else
-    exec >/tmp/moira_update.log 2>&1
-fi
+root=/usr/local/sendmail
 
 MR_MKCRED=47836474
 
-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
+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 /usr/lib/aliases.new.dir
-cp /dev/null /usr/lib/aliases.new.pag
+cp /dev/null $root/etc/aliases.new.db
 
-/usr/lib/sendmail -bi -oA/usr/lib/aliases.new
+$root/sbin/sendmail -bi -oA$root/etc/aliases.new
 if [ $? != 0 ]; then
        exit $MR_MKCRED
-       fi
+fi
 
-kill `ps ax | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $1}'`
+kill `ps -el | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $4}'`
 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
+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*
 
-/usr/lib/sendmail -bd
-/usr/lib/sendmail -q20m
+#$root/sbin/sendmail -bd
+#$root/sbin/sendmail -q20m
+
+sh /etc/init.d/sendmail start
 
 rm -f $0
 exit 0