X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=f690377e24a0ca74459a64d234caeb44cf822c32;hb=fd6c20f705f1313feeb7dd5143d70f24fceb5c4c;hp=a223c8a540ddc05f3a958ce11fb5537fe0b95d53;hpb=42a1df2cf539acf063cd35d2ff5c48c12bb17363;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index a223c8a..f690377 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -733,6 +733,10 @@ restore_configs () {
      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/' \
@@ -948,8 +952,10 @@ upgrade_munin () {
   local config backup hostname domain
 
   # new htmldir location
-  mkdir -p /var/cache/munin
-  mv /var/www/munin /var/cache/munin/www
+  if [ -d /var/www/munin -a ! -e /var/cache/munin/www ]; then
+    mkdir -p /var/cache/munin
+    mv /var/www/munin /var/cache/munin/www
+  fi
 
   for pkg_name in munin munin-node; do
      pkg $pkg_name lt '1.4.5-3' || continue