X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=2f9959a02a6039b527c0f95a9246b2442613b530;hb=f6f72be923b3a355cbd0e9749fa38d6736b37171;hp=d18dd13d0911631bec0e571de11840a6d20ce2a5;hpb=7cb72dc6d7fb9f6ae152d3bb3a5f66ae3df649f7;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index d18dd13..2f9959a 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -103,7 +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
+add_redirection /etc/cron.d/amavisd-new
 
 # Cleanup and finalization
 if dpkg --compare-versions "$2" lt 2:20030616p10-4; then
@@ -151,35 +151,48 @@ 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 [ "$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
+
+restart_daemon="1"
+
+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 amavis.amavisd-new restart
+      invoke-rc.d amavisd-cn restart
     else
-      /etc/init.d/amavis.amavisd-new restart
+      /etc/init.d/amavisd-cn 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
 
 # this needs to be updated when $CRONTAB file changes
 if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
@@ -215,11 +228,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
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+exit 0
 
 #DEBHELPER#
-
-exit 0