X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=clamav-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=a2196536af51480b7c9419fcae51d464ec530dec;hp=50a2959607873c0786c4d8eaa8a51c0af73f5e51;hb=32be87d814fd45d61ab703d640f64cf2d4262004;hpb=ecbb68c462b873939ded49cd9b0aae58190b03e7

diff --git a/debian/postinst b/debian/postinst
index 50a2959..a219653 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,20 +8,6 @@ set -e
 # Load CARNet functions
 . /usr/share/carnet-tools/functions.sh
 
-#if dpkg --compare-versions "$2" lt 2:0.91.1-1 ; then
-#  cp_backup_conffile /etc/clamav/clamd.conf
-#  rm -f /etc/clamav/clamd.conf
-#  cp -a /usr/share/doc/clamav-cn/examples/clamd.conf /etc/clamav/clamd.conf
-#  restart="yes"
-#fi
-#
-#if dpkg --compare-versions "$2" lt 2:0.91.1-1 ; then
-#  cp_backup_conffile /etc/clamav/freshclam.conf
-#  rm -f /etc/clamav/freshclam.conf
-#  cp -a /usr/share/doc/clamav-cn/examples/freshclam.conf /etc/clamav/freshclam.conf
-#  restart="yes"
-#fi
-
 cp_check_and_sed "^AllowSupplementaryGroups false" \
                  "s/AllowSupplementaryGroups false/AllowSupplementaryGroups true/g" \
                  /etc/clamav/clamd.conf && restart="yes" || true
@@ -36,16 +22,36 @@ chown -R clamav:clamav /var/run/clamav /var/lib/clamav /var/log/clamav
 # dodaj korisnika clamav u grupu amavis (ako postoji...)
 getent group amavis > /dev/null && usermod -G amavis clamav && restart="yes"
 
-# restart if needed
-[ "$restart" = "yes" ] || exit 0
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/clamav-daemon ] && invoke-rc.d clamav-daemon restart
-else
-  [ -x /etc/init.d/clamav-daemon ] && /etc/init.d/clamav-daemon restart
+# ispravi opciju od clamscana u amavis konfi
+# --disable-summary -> --no-summary
+if [ -f /etc/amavis/conf.d/15-av_scanners ]; then
+  cp_check_and_sed "\-\-disable-summary" \
+  		   "s/--disable-summary/--no-summary/g" \
+		   /etc/amavis/conf.d/15-av_scanners && restart_amavis="yes" || true
+
+  if [ -f /etc/amavis/conf.d/15-av_scanners.cn-old ]; then
+    rm -f /etc/amavis/conf.d/15-av_scanners.cn-old
+  fi
+fi
+
+# izbaciti MSRBL
+if ! grep -q "^unset msrbl_dbs" /etc/clamav-unofficial-sigs.conf; then
+  echo "unset msrbl_dbs" >> /etc/clamav-unofficial-sigs.conf
 fi
 
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/clamav-freshclam ] && invoke-rc.d clamav-freshclam restart
-else
-  [ -x /etc/init.d/clamav-freshclam ] && /etc/init.d/clamav-freshclam restart
+if [ "$restart_amavis" = "yes" ]; then
+  if [ -x /usr/sbin/invoke-rc.d ]; then
+    [ -x /etc/init.d/amavisd-cn ] && invoke-rc.d amavisd-cn restart
+  else
+    [ -x /etc/init.d/amavisd-cn ] && /etc/init.d/amavisd-cn restart
+  fi
+  # nije potreban restart clamava
+  restart="no"
 fi
+
+# restart if needed
+[ "$restart" = "yes" ] || exit 0
+service clamav-daemon restart
+service clamav-freshclam restart
+
+#DEBHELPER#