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

diff --git a/debian/postinst b/debian/postinst
index b7fba03..0bd6a78 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -151,32 +151,41 @@ 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 [ "$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 $mta restart
+      invoke-rc.d amavisd-cn restart
     else
-      /etc/init.d/$mta restart
+      /etc/init.d/amavisd-cn restart
     fi
   fi
 fi
@@ -220,8 +229,10 @@ 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
-  cp_echo "CN: Deleting old conffile ${conffile}..."
-  rm -f ${conffile}
+  if [ -f ${conffile} ]; then
+    cp_echo "CN: Deleting old conffile ${conffile}..."
+    rm -f ${conffile}
+  fi
 done
 
 cp_mail $PKG $VERSION