X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=01c8da1367d0c6c9ad3a3b4929ac0c9ad62a30bc;hb=3b7b43b4ebd18caed1d19c8583699dc73750b084;hp=ee3f156bdeda0e77205cb72d048dd0907d588c11;hpb=28dd2a69844690525366b877227aa9b7fd6d3b93;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index ee3f156..01c8da1 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,7 +1,22 @@
 #!/bin/sh
+# postinst script for amavisd-cn
+#
+# see: dh_installdeb(1)
 
 set -e
 
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
 case "$1" in
@@ -88,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
@@ -108,29 +113,17 @@ 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
-  /etc/init.d/amavisd-cn stop
-  pkill -9 -u amavis -f '/usr/bin/pyzor check' > /dev/null || true
-  /etc/init.d/amavisd-cn start
-  restart_daemon=
-  restart_mta=
-fi
-
-# START AMAVISD
-# about a half of amavisd-cn script is here
-if [ "$restart_daemon" -a -x /etc/init.d/amavis.amavisd-new ]; then
-  /etc/init.d/amavis.amavisd-new restart
+restart_daemon="1"
+if [ "$restart_daemon" -a -x /etc/init.d/amavis ]; then
+  if [ -x "/etc/init.d/amavis" ]; then
+    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+      invoke-rc.d amavis restart
+    else
+      /etc/init.d/amavis restart
+    fi
+  fi
 fi
 # always check that the daemons are running
-if ! wait_for_fds amavis; then
-  /etc/init.d/amavis.amavisd-new start
-  wait_for_fds amavis
-fi
-if [ "$restart_mta" ]; then
-  /etc/init.d/$mta restart
-fi
 
 # this needs to be updated when $CRONTAB file changes
 if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
@@ -140,13 +133,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!"
@@ -166,4 +153,19 @@ if [ -n "$2" -a -z "$changed_config" ] && \
   cp_echo "    perl -pi -e 's/_CN_DOMAIN_/$domain/g' $ACONF"
 fi
 
+# Delete old conffiles...
+for conffile in /etc/logcheck/violations.ignore.d/amavisd-new \
+         /etc/logcheck/ignore.d.server/amavisd-new \
+         /etc/logcheck/ignore.d.workstation/amavisd-new \
+         /etc/cron.daily/amavisd-new; do
+  if [ -f ${conffile} ]; then
+    cp_echo "CN: Deleting old conffile ${conffile}..."
+    rm -f ${conffile}
+  fi
+done
+
 cp_mail $PKG $VERSION
+
+exit 0
+
+#DEBHELPER#