X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=ed7833291722cb1b108c2ddf5c5e161f1ee03bb9;hb=f73a1d013f3dc420c206d8ba3acb200de8c6df4f;hp=1e831f4533feaa0407090905c8f81174d7d9693e;hpb=a25e4b35569bc4c08a26a2be54c2271e0531d9a0;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 1e831f4..ed78332 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -695,78 +695,42 @@ restore_configs () {
   local hostname domain config_new memtotal memlimit
 
   # restore simple configs
-  if pkg ntp-cn && pkg ntp lt 1:4.2.6.p2+dfsg-1+b1; then
+  if pkg ntp-cn && pkg ntp lt 1:4.2.6.p5+dfsg-2; then
      if restore_file /etc/ntp.conf; then
         postupgrade_reconfigure ntp-cn
      fi
   fi
 
-  if pkg kernel-2.6-cn && pkg procps lt 1:3.2.8-9; then
-     if restore_file /etc/sysctl.conf; then
-        postupgrade_reconfigure kernel-2.6-cn
-     fi
-  fi
-
-  if pkg kernel-2.6-cn && pkg libpam-modules lt 1.1.1-6.1; then
-     if restore_file /etc/security/limits.conf; then
-        postupgrade_reconfigure kernel-2.6-cn
-     fi
-  fi
-
-  if pkg vsftpd-cn && pkg vsftpd lt 2.3.2-3+squeeze2; then
+  if pkg vsftpd-cn && pkg vsftpd lt 2.3.5-3; then
      if restore_file /etc/vsftpd.conf; then
         postupgrade_reconfigure vsftpd-cn
      fi
   fi
 
-  if pkg squirrelmail-cn && pkg squirrelmail lt 2:1.4.21-2; then
-     if restore_file /etc/squirrelmail/apache.conf; then
-        postupgrade_reconfigure squirrelmail-cn
+  if pkg amavisd-cn && pkg amavisd-new lt 1:2.7.1-2; then
+     if restore_file /etc/cron.d/amavisd-new; then
+        rm -f /etc/cron.d/amavisd-new.$backup_ext
+        postupgrade_reconfigure amavisd-cn
      fi
   fi
 
-  if pkg spamassassin-cn && pkg spamassassin lt 3.3.1-1; then
-     if restore_file /etc/spamassassin/v310.pre; then
-        postupgrade_reconfigure spamassassin-cn
+  if pkg ossec-hids lt 2.7-1; then
+     if restore_file /var/ossec/rules/local_rules.xml; then
+        postupgrade_reconfigure ossec-hids-cn
      fi
   fi
 
-  if pkg amavisd-cn && pkg amavisd-new lt 1:2.6.4-3; then
-     if restore_file /etc/cron.daily/amavisd-new; then
-        rm -f /etc/cron.daily/amavisd-new.$backup_ext
-        postupgrade_reconfigure amavisd-cn
+  if pkg sasl2-bin lt 2.1.25.dfsg1-6+deb7u1; then
+     if restore_file /etc/default/saslauthd; then
+        postupgrade_reconfigure postfix-cn
      fi
-
-     if restore_file /etc/amavis/conf.d/15-av_scanners; then
-        rm -f /etc/amavis/conf.d/15-av_scanners.$backup_ext
-        postupgrade_reconfigure amavisd-cn
-     fi
-  fi
-
-  if pkg amavisd-cn lt 3:2.6.5; then
-     restore_file /etc/init.d/amavisd-cn
-     rm -f /etc/init.d/amavisd-cn.$backup_ext
-  fi
-
-  if pkg console-tools lt 1:0.2.3dbs-69.1; then
-     restore_file /etc/console-tools/config
   fi
 
-  if pkg base-files lt 6.0squeeze2; then
+  if pkg base-files lt 7.1wheezy2; then
      restore_file /etc/issue
      restore_file /etc/issue.net
   fi
 
-  if pkg slapd lt 2.4.23-7.2; then
-     restore_file /etc/default/slapd
-  fi
-
-  # dovecot won't start with these options
-  if pkg dovecot-cn && pkg dovecot-common lt 1:1.2.15-7; then
-     sed -i 's/^\( *\)\(sieve\(_storage\)\?=.*\)/\1#\2/' \
-         /etc/dovecot/dovecot.conf
-  fi
-
   # check if monitrc is template based
   if [ -e /etc/monit/monitrc ]; then # monit is removed at this point
      # regenerate config from template