X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=1d05d1cb00e1cc92532dc0212e0338125fe7016b;hb=30276562f0891449dad1600bf910810cd3d581f3;hp=27fa13d70be49857cf7237aa2cccd6a0183c0b21;hpb=593a505177247c3eedf76b9018b37c2b8be10789;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 27fa13d..1d05d1c 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -883,19 +883,35 @@ upgrade_amavis () {
 upgrade_freeradius () {
   pkg freeradius-aai lt 2.1.10-1 || return 0
 
-  # aai team prevents a clean upgrade
+  # aai team prevents a normal upgrade
   cp -av /etc/freeradius /etc/freeradius.$backup_ext
   pkgrm freeradius-aai freeradius-ldap freeradius
+  rm -rf /etc/freeradius/certs
   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
+     pkgadd mysql-server
+     pkgrm mysql-server-5.0
+     /etc/init.d/mysql start
+  fi
+}
+
 # fix postgresql deinstallation during upgrade
 upgrade_postgresql () {
   if check_services show 2>&1 | grep -qw postgresql; then