X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=94db9b049beaeff3640cf5ee3a2c37d11580015f;hb=1f2da037f06adc5e03b674cc57389d0ee7b30072;hp=95dd0e380bf10df7c20f9faf4618bf300dbfd0ac;hpb=22426cb04f83c7e95d7e05d9e49d9fab23a4c03c;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 95dd0e3..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 @@ -852,7 +866,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 @@ -890,19 +904,12 @@ upgrade_freeradius () { pkgadd freeradius-aai } -# handle openldap upgrade -upgrade_openldap () { - # 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 + dpkg -P mysql-server-5.0 + /etc/init.d/mysql restart fi } @@ -944,6 +951,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