X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ddf4581b3ffcea69604ff23380cf583f3902e246;hb=769486bfdf841be2143514182d1297b644664b34;hp=4318c671ffc4345fe2d10939d970a2b33e6eb18c;hpb=61805068024f01b49ef44adb1b0f7f0e2f9524c4;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 4318c67..ddf4581 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,8 +1,22 @@
 #!/bin/sh
-# last update: zoran.dzelajlija@carnet.hr  Fri, 19 Oct 2007 00:34:32 +0200
+# 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
@@ -28,17 +42,6 @@ export PATH
 . /usr/share/amavisd-cn/variables.sh
 . /usr/share/amavisd-cn/functions.sh
 
-# Place configuration tweaks done on upgrades into this function
-update_conf() {
-  [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
-  # placeholder.
-  # remember to set changed_config=1 and restart_daemon=1 if necessary
-  #:
-  if dpkg --compare-versions "$1" lt 3:2.4.2-3; then
-    conf_from_template
-  fi
-}
-
 mta=postfix
 . /usr/share/amavisd-cn/postfix.sh
 
@@ -46,7 +49,7 @@ mta=postfix
 cp_get_mx_domain
 domain=$RET
 
-update_postfix
+update_postfix $*
 
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
@@ -69,22 +72,14 @@ fi
 if [ ! -f $ACONF -o ! -s $ACONF ]; then
   # Create fresh config from template
   conf_from_template
+  restart_daemon=1
 fi
 
-# check for SAVI:
-# if not there, comment it out, if there, uncomment and restart
-if ! dpkg -l libsavi-perl 2> /dev/null | egrep -q '^.i' || ! [ -f /usr/lib/libsavi.so ]; then
-  if cp_check_and_sed "^\['Sophos SAVI'" \
-     "s/^\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
-    cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
-    cp_echo "    To enable it, run sophos-sweep-update, uncomment and restart amavis."
-  fi
-else
-  if cp_check_and_sed "^#\['Sophos SAVI'" \
-     "s/^#\(\['Sophos SAVI', ..sophos_savi \]\)/\1/" $ACONF; then
-    cp_echo "CN: Enabled SAVI::Perl usage in ${ACONF}."
-    restart_daemon=1
-  fi
+# disable SAVI as proven problematic
+if cp_check_and_sed "^[[:blank:]]*\['Sophos SAVI'" \
+ "s/^[[:blank:]]*\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
+  cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
+  restart_daemon=1
 fi
 
 check_and_add_alias virusalert root
@@ -107,15 +102,8 @@ fi
 # No sysvinit order fixes
 :
 
-# 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
+# Fix missing redirection in cron files for amavisd-new-cronjob
+add_redirection /etc/cron.d/amavisd-new
 
 if [ -n "$chown_ahome" ]; then
   # might be slow
@@ -125,29 +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
-  /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" ]; then
+  service amavis restart
 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
@@ -157,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!"
@@ -183,4 +147,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#