X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=10a632c27ce8c64f9b250423537f2a50d53a5945;hb=1a6944c221294202ee0b5e89c2d9f4dc6fdbcc5e;hp=4ce2de2ed98696f9296a8d763738a11ee35edf2e;hpb=9881eb03821c641460350eee4ed7aa0350e5c6ca;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 4ce2de2..10a632c 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-# last update: zoran.dzelajlija@carnet.hr  Fri, 19 Oct 2007 00:34:32 +0200
 
 set -e
 
@@ -28,14 +27,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
-  :
-}
-
 mta=postfix
 . /usr/share/amavisd-cn/postfix.sh
 
@@ -43,23 +34,19 @@ mta=postfix
 cp_get_mx_domain
 domain=$RET
 
-update_postfix
+update_postfix $*
 
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
   cp_echo "CN: Amavisd configuration is now in $ACONF."
-  cp_echo "    Previous location was $ACONFOLD."
-  cp_backup_conffile "$ACONFOLD"
+  noisy_backup "$ACONFOLD"
   rm -f "$ACONFOLD"
-  cp_echo "    Old file renamed to $ACONFMOVED."
-  fi
   cp_echo ""
   cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
 elif [ -f "$ACONFOLD.disabled" ]; then
-  cp_backup_conffile "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
+  noisy_backup "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
   rm -f "$ACONFOLD.disabled"
-  cp_echo "CN: Removed $ACONFOLD.disabled."
-  cp_echo "    Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
 fi
 
 if [ -f $ACONF ]; then
@@ -91,24 +78,26 @@ fi
 check_and_add_alias virusalert root
 check_and_add_alias spamalert root
 
-if [ ! -f $AHOME/.spamassassin/user_prefs ] ; then
-  [ -d $AHOME/.spamassassin ] || mkdir -p $AHOME/.spamassassin
-  cat > $AHOME/.spamassassin/user_prefs <<-EEND
+# ovo je rijeseno u spamassassin-cn, i ovdje nije potrebno, stoga brisemo
+if [ -f $AHOME/.spamassassin/user_prefs ] ; then
+  user_prefs_temp=$(mktemp /tmp/user_prefs.XXXXXX)
+  cat > $user_prefs_temp <<-EEND
 	bayes_path		$AHOME/.spamassassin/bayes
 	bayes_auto_expire	0
 	auto_whitelist_path	$AHOME/.spamassassin/auto-whitelist
 	EEND
-  chown_ahome=1
-fi
-
-if [ ! -f $AHOME/.spamassassin/auto-whitelist ] ; then
-  touch $AHOME/.spamassassin/auto-whitelist
-  chown_ahome=1
+  if cmp -s $user_prefs_temp $AHOME/.spamassassin/user_prefs; then
+    rm -f $AHOME/.spamassassin/user_prefs
+  fi
+  rm -f $user_prefs_temp
 fi
 
 # No sysvinit order fixes
 :
 
+# 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