X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=94db9b049beaeff3640cf5ee3a2c37d11580015f;hb=1f2da037f06adc5e03b674cc57389d0ee7b30072;hp=59cd2af2fb3629198489556d54a8e7f4b8b56a0a;hpb=7a7cf98189a94ee061e88f1807a6d9d11e447ea0;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 59cd2af..94db9b0 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/' \
@@ -823,9 +827,19 @@ disable_monit () {
     apt-get remove --yes monit
     # stop the binary
     pkill -9 monit || true
+    # move away init for insserv to work
+    mv /etc/init.d/monit /var/lib/carnet-upgrade/
   fi
 }
 
+# allow monit to run again
+enable_monit () {
+  if [ -f /var/lib/carnet-upgrade/monit ]; then
+    mv /var/lib/carnet-upgrade/monit /etc/init.d/monit
+    pkgadd monit-cn
+  fi 
+}
+
 # check which of the given packages are installed
 grep_installed () {
   local package installed
@@ -890,19 +904,6 @@ upgrade_freeradius () {
   pkgadd freeradius-aai
 }
 
-# handle openldap upgrade
-upgrade_openldap () {
-  # aai discovers database type from debconf
-  if [ -f /etc/ldap/slapd.conf ] && grep -q ^database.*bdb /etc/ldap/slapd.conf
-  then
-     echo set slapd/backend BDB | debconf-communicate >/dev/null
-  fi
-
-  # aai does not depend on the new openldap version
-  pkgadd slapd
-  pkgadd openldap-aai
-}
-
 # handle mysql 5.0 to 5.1 upgrade
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.0; then