Munin htmldir change.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 95dd0e3..59cd2af 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -852,7 +852,7 @@ pkgupgrade () {
 
 # make a silent upgrade to new libc6
 upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata udev
+  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
 }
 
 # upgrade apache2/php5
@@ -892,6 +892,12 @@ upgrade_freeradius () {
 
 # 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
@@ -901,8 +907,8 @@ upgrade_openldap () {
 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
+     dpkg -P mysql-server-5.0
+     /etc/init.d/mysql restart
   fi
 }
 
@@ -944,6 +950,10 @@ get_variable () {
 upgrade_munin () {
   local config backup hostname domain
 
+  # new htmldir location
+  mkdir -p /var/cache/munin
+  mv /var/www/munin /var/cache/munin/www
+
   for pkg_name in munin munin-node; do
      pkg $pkg_name lt '1.4.5-3' || continue