X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=4231a3d9faf04310d42a66909379be9da4f23eef;hb=b5a5fe6498b45c861a4d970274fed1fa2a306177;hp=0bd6a78a042796aabd8637c7ebc87f378a8df80a;hpb=200ba04c11dc7ea4d18b3265309531543c928e12;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 0bd6a78..4231a3d 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -57,11 +57,11 @@ if [ -f "$ACONFOLD" ]; then
   noisy_backup "$ACONFOLD"
   rm -f "$ACONFOLD"
   cp_echo ""
-  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNET."
 elif [ -f "$ACONFOLD.disabled" ]; then
   noisy_backup "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
   rm -f "$ACONFOLD.disabled"
-  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNET."
 fi
 
 if [ -f $ACONF ]; then
@@ -103,17 +103,7 @@ fi
 :
 
 # Fix missing redirection in cron files for amavisd-new-cronjob
-add_redirection /etc/cron.d/amavisd-new /etc/cron.daily/amavisd-new
-
-# Cleanup and finalization
-if dpkg --compare-versions "$2" lt 2:20030616p10-4; then
-  update-rc.d -f amavisd remove > /dev/null
-  restart_daemon=1
-  chown_ahome=1
-  # a complicated way to say chmod 750
-  dpkg-statoverride --remove $AHOME > /dev/null || true
-  dpkg-statoverride --update --add amavis amavis 750 $AHOME
-fi
+add_redirection /etc/cron.d/amavisd-new
 
 if [ -n "$chown_ahome" ]; then
   # might be slow
@@ -123,72 +113,11 @@ if [ -n "$chown_ahome" ]; then
   cp_echo -mailonly "CN: Fixed ownerships in /var/*/amavis."
 fi
 
-# kill naughty pyzor descendants -- XXX needed for 2.4 or not?
-if dpkg --compare-versions "$2" lt 2:20030616p10-7 && \
-  pgrep -u amavis -f '/usr/bin/pyzor check' > /dev/null; then
-  if [ -x "/etc/init.d/amavisd-cn" ]; then
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d amavisd-cn stop
-    else
-      /etc/init.d/amavisd-cn stop
-    fi
-  fi
-  pkill -9 -u amavis -f '/usr/bin/pyzor check' > /dev/null || true
-  if [ -x "/etc/init.d/amavisd-cn" ]; then
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d amavisd-cn start
-    else
-      /etc/init.d/amavisd-cn start
-    fi
-  fi
-  restart_daemon=
-  restart_mta=
-fi
-
-# register for automatic start
-update-rc.d -f amavis remove >/dev/null || true
-update-rc.d amavisd-cn defaults 19 21 >/dev/null
-
-# START AMAVISD
-# about a half of amavisd-cn script is here
-#if [ "$restart_daemon" -a -x /etc/init.d/amavis.amavisd-new ]; then
-#  if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
-#    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-#      invoke-rc.d amavis.amavisd-new restart
-#    else
-#      /etc/init.d/amavis.amavisd-new restart
-#    fi
-#  fi
-#fi
-## always check that the daemons are running
-#if ! wait_for_fds amavis; then
-#  if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
-#    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-#      invoke-rc.d amavis.amavisd-new start
-#    else
-#      /etc/init.d/amavis.amavisd-new start
-#    fi
-#  fi
-#  wait_for_fds amavis
-#fi
-#if [ "$restart_mta" ]; then
-#  if [ -x "/etc/init.d/$mta" ]; then
-#    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-#      invoke-rc.d $mta restart
-#    else
-#      /etc/init.d/$mta restart
-#    fi
-#  fi
-#fi
-if [ "$restart_daemon" -a -x /etc/init.d/amavisd-cn ]; then
-  if [ -x "/etc/init.d/amavisd-cn" ]; then
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d amavisd-cn restart
-    else
-      /etc/init.d/amavisd-cn restart
-    fi
-  fi
+restart_daemon="1"
+if [ "$restart_daemon" ]; then
+  service amavis restart
 fi
+# always check that the daemons are running
 
 # this needs to be updated when $CRONTAB file changes
 if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
@@ -198,13 +127,7 @@ if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
   cp_echo "CN: Deleting virus-mail older than 7 days every day at 04:25 AM"
   cp_echo "    (can be changed in $CRONTAB)"
 fi
-# This script is, hopefully, not needed any more.  Hide it.
-## display this message just once... maybe use debconf instead
-#if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
-#  cp_echo ""
-#  cp_echo "CN: To stop, start or restart all of the clamav+amavis+mta components,"
-#  cp_echo "CN: use the /etc/init.d/amavisd-cn script."
-#fi
+
 if [ "$failed" ]; then
   cp_echo ""
   cp_echo "CN: Services $failed failed to restart!"
@@ -238,3 +161,5 @@ done
 cp_mail $PKG $VERSION
 
 exit 0
+
+#DEBHELPER#