X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;h=59cd2af2fb3629198489556d54a8e7f4b8b56a0a;hp=527742a7398c423eaef4673fd6b0cb909187f5af;hb=7a7cf98189a94ee061e88f1807a6d9d11e447ea0;hpb=10ec3e3b569db35e08ccc350359401a515574de1 diff --git a/src/functions.sh b/src/functions.sh index 527742a..59cd2af 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -22,28 +22,17 @@ pkg() { } log() { + local old_umask logfile=${logfile:=/var/log/carnet-upgrade.log} - touch $logfile + + old_umask=$(umask) + umask 0077 + echo "$(date +'%Y-%m-%d %H:%M:%S') $*" >> $logfile echo "CN: $*" -} -# find first free uid/gid in range -# find_id passwd 100 999 -find_id() { - local i db first last ids - db=$1 - first=$2 - last=$3 - ids=$(getent $db | awk -F: "\$3 >= $first && \$3 <= $last {print \$3}") - for i in $(seq $first $last) - do - if ! echo $ids | grep -q $i; then - echo $i - return 0 - fi - done - return 1 + umask $old_umask + chmod og= $logfile } # safe in-place s/// @@ -72,27 +61,6 @@ check_and_sed() { return $ret } -# -# Update uid for user from reserved system range (0-99) to dynamic system -# range (100-999). Optionally update ownerships of given directories. -# $0 user [directory ...] -# -check_and_update_ugid() { - local user newgid newuid - user=$1 - if [ "$(getent passwd $user | awk -F: '$3 >= 100 {print "ok"; exit 0}')" ]; then - return 0 - fi - shift - newgid=$(find_id group 100 999) - newuid=$(find_id passwd 100 999) - # other directories/files - chown -R $newuid:$newgid $* - groupmod -g $newgid $user - usermod -u $newuid -g $newgid $user - log "Fixed $user user uid/gid." -} - pkgadd () { [ -n "$*" ] || return 0 log "Installing $* ..." @@ -139,6 +107,12 @@ apt_download() { } dist_upgrade () { + log "Running upgrade ..." + apt-get -y$s upgrade || { + dpkg --configure -a + apt-get -y$s upgrade + } + log "Running dist-upgrade ..." apt-get -y$s dist-upgrade || { dpkg --configure -a @@ -146,11 +120,19 @@ dist_upgrade () { } } +apt_autoremove () { + log "Running autoremove ..." + apt-get -y$s --purge autoremove || { + dpkg --configure -a + apt-get -yf install + } +} + remove_x() { LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75 if [ $? -eq 0 ]; then log "Removing X Window System" - pkgrm xlibs + pkgrm x11-common else log "Skipping X Window System removal" fi @@ -369,7 +351,7 @@ check_upgrade () { if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian Squeeze potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -385,38 +367,6 @@ Nakon toga ponovno pozovite ovu skriptu." fi } -# update sarge urls in sources list -fix_sarge_sources () { - local apt_sources='/etc/apt/sources.list' - local fixed_sources=$(mktemp /var/lib/carnet-upgrade/sources.list.XXXXXX) - - # sarge (oldstable) was archived recently -> sources.list needs update - awk -v archive='http://archive.debian.org/debian' \ - -v security='http://archive.debian.org/debian-security' \ - '$3 == "sarge" && $2 ~ /[/]debian$/ { $2 = archive } - $3 == "sarge/updates" && $2 ~ /security\.debian\.org$/ { $2 = security } - { print }' $apt_sources > $fixed_sources - - # did anything get updated - if ! cmp $apt_sources $fixed_sources >/dev/null; then - log "sources.list fixed to use archive.debian.org" - - # backup current version - if [ ! -f "$apt_sources.$backup_ext.sarge" ]; then - cp -av $apt_sources "$apt_sources.$backup_ext.sarge" - fi - - # install fixed version - cp -av $fixed_sources $apt_sources - - # update the database - apt_update - fi - - # delete temporary - rm -f $fixed_sources -} - # try to check if we are using the latest version of carnet-upgrade script check_my_version () { local packages latest_version @@ -440,49 +390,6 @@ check_my_version () { rm -f $packages } -# if apache is installed make sure it's version 2 -check_apache_version () { - - if pkg apache-cn && ! pkg apache2-cn; then - notice " -Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0. - -Pokrenite: - # apt-get update - # apt-get install apache2-cn - -Nakon toga ponovno pozovite ovu skriptu." - log "carnet-upgrade aborted, upgrade to apache2-cn needed." - exit 1 - fi -} - -# if grsec is installed make sure it is fresh -check_grsec_kernel () { - local ver=`uname -r` - - log "Kernel version: $ver" - if [ "$ver" = "${ver%-grsec}" ]; then - # not grsec variant - return 0 - fi - - if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then - # kernel too old - notice " -Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju na najnoviji kernel. - -Pokrenite: - # apt-get update - # apt-get install kernel-2.6-cn - # reboot - -Nakon toga ponovno pozovite ovu skriptu." - log "carnet-upgrade aborted, kernel upgrade needed." - exit 1 - fi -} - check_reboot () { reboot_required || return 0 @@ -499,23 +406,35 @@ check_reboot () { reboot_required () { local default_kernel kernel_package running_release running_version - # try to get default kernel from lilo - if type lilo >/dev/null 2>&1; then - default_kernel=$( lilo -t -v 2>/dev/null \ - | grep -B3 '[*]$' \ - | sed -n -e '/^Boot image: / { s///p; q; }' ) + # try to get default kernel from grub2 + if [ -z "$default_kernel" -a -r "/boot/grub/grub.cfg" ]; then + default_kernel=$( awk ' + $0 ~ /^set default=".*"/ { + def = gensub(/default="(.*)"/, "\\1", "1", $2); + if (def !~ /^[0-9]+$/) { exit } + } + $1 == "menuentry" { menuentry+=1 } + $1 == "linux" && menuentry==def+1 { print $2; exit }' \ + /boot/grub/grub.cfg 2>/dev/null ) fi - # fallback to grub if lilo not installed + # try to get default kernel from grub-legacy if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then default_kernel=$( awk ' - $1 == "default" { default = $2; - if (default != /^[[:digit:]]+$/) { exit } } + $1 == "default" { def = $2; + if (def !~ /^[0-9]+$/) { exit } } $1 == "title" { title+=1 } - $1 == "kernel" && title==default+1 { print $2; exit }' \ + $1 == "kernel" && title==def+1 { print $2; exit }' \ /boot/grub/menu.lst 2>/dev/null ) fi + # try to get default kernel from lilo + if [ -z "$default_kernel" ] && type lilo >/dev/null 2>&1; then + default_kernel=$( lilo -t -v 2>/dev/null \ + | grep -B3 '[*]$' \ + | sed -n -e '/^Boot image: / { s///p; q; }' ) + fi + if [ -z "$default_kernel" ]; then log "Could not find default kernel" return 1 @@ -524,8 +443,12 @@ reboot_required () { log "Default kernel image: $default_kernel" if [ ! -e "$default_kernel" ]; then - log "Default kernel image doesn't exist!?" - return 1 + # /boot prefix might be missing + default_kernel="/boot/${default_kernel#/}" + if [ ! -e "$default_kernel" ]; then + log "Default kernel image doesn't exist!?" + return 1 + fi fi kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 ) @@ -537,11 +460,6 @@ reboot_required () { log "Default kernel package: $kernel_package" - if [ "$kernel_package" != "kernel-2.6-cn" ]; then - log "Default kernel package is not kernel-2.6-cn" - return 1 - fi - running_release=$( uname -r ) running_version=$( uname -v ) log "Running kernel: $running_release $running_version" @@ -556,7 +474,7 @@ reboot_required () { } upgrade () { - local i to_install packages + local packages case "$1" in first) packages="$packages_first" @@ -568,15 +486,13 @@ upgrade () { return 1 esac - for i in $(echo $packages) - do - pkg $i && to_install="$to_install $i" - done + pkgupgrade $packages +} - if [ -n "$to_install" ];then - eval pkgadd $to_install - else - return 0 +# install packages introduced in this release +install_new () { + if [ "$new_packages" ]; then + pkgadd $new_packages fi } @@ -657,7 +573,7 @@ backup_slapd_db () { [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius start || true else log "slapd backup already at $ldap_backup, skipping." - notice "Backup slapd baze u $ldap_backup vec postoji!" + #notice "Backup slapd baze u $ldap_backup vec postoji!" fi } @@ -681,177 +597,159 @@ backup_etc_dir () { umask $old_umask else log "/etc backup already present in $etc_backup, skipping." - notice "Backup /etc direktorija u $etc_backup vec postoji!" + #notice "Backup /etc direktorija u $etc_backup vec postoji!" fi } -# fixaj /etc/default/raid2 -fix_etc_default_raid2 () { - if [ -f /etc/default/raid2 ]; then - sed "s/^AUTOSTART.*/AUTOSTART=true/g" /etc/default/raid2 > /etc/default/raid2.$backup_ext.$$ - chown --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$ - chmod --reference=/etc/default/raid2 /etc/default/raid2.$backup_ext.$$ +# restore a configuration file if it contains only CN modifications +restore_file () { + local file file_expect file_restore file_backup - if ! cmp -s /etc/default/raid2.$backup_ext.$$ /etc/default/raid2; then - log "Fixed /etc/default/raid2 AUTOSTART option." - mv -v /etc/default/raid2.$backup_ext.$$ /etc/default/raid2 - else - rm -v /etc/default/raid2.$backup_ext.$$ - fi + file=$1 + file_expect=$2 + file_restore=$3 + file_backup=$file.$backup_ext + + [ "$file_expect" ] || file_expect=$cnup/files/$file.expect + [ "$file_restore" ] || file_restore=$cnup/files/$file.restore + + # check if all required files are there + if ! [ -e $file -a -e $file_expect -a -e $file_restore ]; then + log "Required files missing, skipping $file restore." + return 1 + fi + + # is restore needed + if ! cmp $file_expect $file >/dev/null; then + log "Config doesn't match the template, skipping $file restore." + return 1 + fi + + # backup and restore + if [ ! -e $file_backup ]; then + log "Restoring config file $file." + + # backup local changes + cp -av $file $file_backup + + # restore original + cp -v $file_restore $file + + # restore succedded + return 0 + else + log "Backup file exists, skipping $file restore." + return 1 fi } -# restore original config file (if the new package version is not -# installed already) -restore_config () { - local file file_backup file_expect file_restore config_changed - local cn_package cn_version package version +# force reconfiguration at the end if package is not upgraded automatically +postupgrade_reconfigure () { + local cn_package cn_version - # check if new package version is installed cn_package=$1 - package=$2 - version=$3 + cn_version=$( dpkg -s "$cn_package" | awk '/^Version:/ {print $2}' ) + post_upgrade "pkg $cn_package gt $cn_version || dpkg-reconfigure $cn_package" +} + +# copy template into a temporary file +copy_template () { + local path file template config_new - if [ "$cn_package" ]; then - if ! pkg $cn_package; then - # do nothing if cn package is not installed - return 0 + path=$1 + file=$(basename $path) + template=$cnup/files/$path.template + config_new=$(mktemp /var/lib/carnet-upgrade/$file.XXXXXX) + cp $template $config_new + + echo $config_new +} + +# restore modified config to their package defaults +# so the upgrade doesn't complain so much +restore_configs () { + local hostname domain config_new memtotal memlimit + + # restore simple configs + if pkg ntp-cn && pkg ntp lt 1:4.2.6.p2+dfsg-1+b1; then + if restore_file /etc/ntp.conf; then + postupgrade_reconfigure ntp-cn fi fi - if [ "$package" ]; then - if [ "$version" ]; then - # do nothing if package is already upgraded to new version - pkg $package lt $version || return 0 - else - # do nothing if package is not installed - pkg $package || return 0 + if pkg kernel-2.6-cn && pkg procps lt 1:3.2.8-9; then + if restore_file /etc/sysctl.conf; then + postupgrade_reconfigure kernel-2.6-cn + fi + fi + + if pkg kernel-2.6-cn && pkg libpam-modules lt 1.1.1-6.1; then + if restore_file /etc/security/limits.conf; then + postupgrade_reconfigure kernel-2.6-cn fi fi - shift 3 - - # restore package files - for file in $*; do - file_expect=/usr/share/carnet-upgrade/files/$file.expect - file_restore=/usr/share/carnet-upgrade/files/$file.restore - file_backup=$file.$backup_ext - - # is config files are there - if ! [ -e $file -a -e $file_expect -a -e $file_restore ]; then - continue - fi - - # is restore needed - if ! cmp $file_expect $file >/dev/null; then - continue - fi - # backup and restore - if [ ! -e $file_backup ]; then - log "Restoring config file $file" + if pkg vsftpd-cn && pkg vsftpd lt 2.3.2-3+squeeze2; then + if restore_file /etc/vsftpd.conf; then + postupgrade_reconfigure vsftpd-cn + fi + fi - # backup local changes - cp -av $file $file_backup + if pkg squirrelmail-cn && pkg squirrelmail lt 2:1.4.21-2; then + if restore_file /etc/squirrelmail/apache.conf; then + postupgrade_reconfigure squirrelmail-cn + fi + fi - # restore original - cp -v $file_restore $file + if pkg spamassassin-cn && pkg spamassassin lt 3.3.1-1; then + if restore_file /etc/spamassassin/v310.pre; then + postupgrade_reconfigure spamassassin-cn + fi + fi - config_changed=1 - fi - done + if pkg amavisd-cn && pkg amavisd-new lt 1:2.6.4-3; then + if restore_file /etc/cron.daily/amavisd-new; then + rm -f /etc/cron.daily/amavisd-new.$backup_ext + postupgrade_reconfigure amavisd-cn + fi - # force reconfiguration at the end if package is not upgraded automatically - if [ "$config_changed" -a "$cn_package" ]; then - cn_version=$( dpkg -s "$cn_package" | awk '/^Version:/ {print $2}' ) - post_upgrade "pkg $cn_package gt $cn_version || dpkg-reconfigure $cn_package" + if restore_file /etc/amavis/conf.d/15-av_scanners; then + rm -f /etc/amavis/conf.d/15-av_scanners.$backup_ext + postupgrade_reconfigure amavisd-cn + fi fi -} -# restore modified config to their package defaults -# so the upgrade doesn't complain so much -restore_configs () { - local hostname domain template config_new - local config_backup + if pkg amavisd-cn lt 3:2.6.5; then + restore_file /etc/init.d/amavisd-cn + rm -f /etc/init.d/amavisd-cn.$backup_ext + fi - # restore simple configs - restore_config kernel-2.6-cn procps 1:3.2.7-11 /etc/sysctl.conf - restore_config ntp-cn ntp 1:4.2.4p4+dfsg-8 /etc/ntp.conf - restore_config apache2-cn apache2.2-common 2.2.9-10+lenny2 /etc/apache2/ports.conf - restore_config postfix-cn sasl2-bin 2.1.22.dfsg1-23 /etc/default/saslauthd - restore_config bind9-cn bind9 1:9.5.1.dfsg.P1-1 /etc/bind/named.conf.options - restore_config amavisd-cn amavisd-new 1:2.6.1.dfsg-1 /etc/cron.daily/amavisd-new - rm -f /etc/cron.daily/amavisd-new.$backup_ext - restore_config spamassassin-cn razor 1:2.85-1 /etc/razor/razor-agent.conf - restore_config kernel-2.6-cn libpam-modules 1.0.1-5 /etc/security/limits.conf - restore_config samba-cn samba-common 2:3.2.5-4lenny2 /etc/samba/smb.conf + if pkg console-tools lt 1:0.2.3dbs-69.1; then + restore_file /etc/console-tools/config + fi + + if pkg base-files lt 6.0squeeze2; then + restore_file /etc/issue + restore_file /etc/issue.net + 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/' \ + /etc/dovecot/dovecot.conf + fi # check if monitrc is template based - if [ -f /etc/monit/monitrc -a ! -f /etc/monit/monitrc.$backup_ext ]; then - template=/usr/share/carnet-upgrade/files/etc/monit/monitrc.template - config_new=$(mktemp /var/lib/carnet-upgrade/monitrc.XXXXXX) + if [ -e /etc/monit/monitrc ]; then # monit is removed at this point + # regenerate config from template hostname=$(hostname) domain=$(hostname --domain) - - # generate config from template - cp $template $config_new + config_new=$(copy_template /etc/monit/monitrc) check_and_sed "@localhost" \ "s/@localhost/@$hostname.$domain/g" $config_new || true - - # compare with running config - if cmp -s /etc/monit/monitrc $config_new; then - # restore if running config is generated template - log "Restoring config file /etc/monit/monitrc" - cp -av /etc/monit/monitrc /etc/monit/monitrc.$backup_ext - cp -v /usr/share/carnet-upgrade/files/etc/monit/monitrc.restore \ - /etc/monit/monitrc - fi + restore_file /etc/monit/monitrc $config_new rm -f $config_new fi - -# restore_config base-files 4 /etc/issue /etc/issue.net -# restore_config base-files 4 /etc/issue /etc/issue.net -# restore_config login 1:4.0.18.1 /etc/pam.d/login -# restore_config mysql-server 5.0.3 /etc/init.d/mysql \ -# /etc/logrotate.d/mysql-server \ -# /etc/mysql/my.cnf -# restore_config ntpdate 1:4.2.2 /etc/default/ntpdate -# restore_config oidentd 2.0.8 /etc/default/oidentd -# restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd -# restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf -# restore_config vsftpd 2.0.5 /etc/vsftpd.conf -# restore_config xinetd 1:2.3.14 /etc/xinetd.conf -# -# # orphaned config file - no owner -# if pkg logcheck-database lt 1.2.54; then -# rm -vf /etc/logcheck/ignore.d.server/imap -# fi -# -# # aide switched to ucf, move old configs aside -# if pkg aide lt 0.13.1; then -# for file in /etc/aide/aide.conf \ -# /etc/cron.daily/aide \ -# /etc/default/aide; -# do -# if [ ! -e "$file.$backup_ext" ]; then -# mv -v "$file" "$file.$backup_ext" -# fi -# -# rm -vf "$file" -# done -# fi -# -# # register cn changes in ucf managed files -# for config in /etc/apache/modules.conf \ -# /etc/clamav/clamd.conf \ -# /etc/clamav/freshclam.conf -# do -# config_backup=$config.$backup_ext -# if [ -e $config -a ! -e $config_backup ]; then -# log "Saving config file $config" -# cp -av $config $config_backup -# ucf $config_backup $config -# fi -# done } # temporary disable listchanges packages to reduce clutter during upgrade @@ -881,22 +779,11 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { pkgadd carnet-keyring srce-keyring debian-archive-keyring - pkgadd dpkg apt debconf python-apt dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring apt_update } -# remove skey (not supported anymore) -remove_skey () { - pkgrm skey-cn libpam-skey - - if getent group skey > /dev/null; then - groupdel skey || true - log "groupdel skey" - fi -} - # check if package is orphaned (nothing depends on it) is_orphaned () { local package deps @@ -914,6 +801,8 @@ is_orphaned () { remove_orphaned () { local package + apt_autoremove + for package in $orphaned_packages; do if is_orphaned $package; then pkgrm $package @@ -937,49 +826,45 @@ disable_monit () { fi } -# make a silent upgrade to new libc6 -upgrade_libc () { - DEBIAN_FRONTEND=noninteractive pkgadd libc6 -} +# check which of the given packages are installed +grep_installed () { + local package installed -# upgrade apache2 to etch -upgrade_apache2 () { - local package packages - - for package in \ - libapache2-mod-php4 \ - php4-cli \ - php4-cgi \ - php4-cn \ - apache2-cn \ - php4-odbc \ - php4-suhosin \ - php-suhosin-cn - do - if pkg $package; then - packages="$packages $package" - fi + for package in $*; do + if pkg $package; then + installed="$installed $package" + fi done - # enable suhosin downgrade to etch version - if pkg php4-suhosin; then - pkgrm php4-suhosin php-suhosin-cn + echo $installed +} + +# only upgrade packages if they are already installed +pkgupgrade () { + local packages + + packages=$( grep_installed $* ) + + if [ "$packages" ]; then + eval pkgadd $packages fi +} - eval pkgadd $packages +# make a silent upgrade to new libc6 +upgrade_libc () { + DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata +} + +# upgrade apache2/php5 +upgrade_apache2 () { + pkgrm apache-common # prevents installation of apache2-suexec + pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \ + php5-odbc php5-suhosin php-suhosin-cn } upgrade_amavis () { local conf - # remove init script diversion before upgrade - if pkg amavisd-cn lt 3:2.6.1-1; then - if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then - rm -vf /etc/init.d/amavis - dpkg-divert --remove /etc/init.d/amavis - fi - fi - # move old config aside for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do if [ -e $conf -a ! -e $conf.$backup_ext ]; then @@ -990,113 +875,40 @@ upgrade_amavis () { # install new packages pkgadd amavisd-cn amavisd-new - # fix new packages - check_and_sed '^clamd.*5.clamav.log$' \ - 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \ - /etc/init.d/amavisd-cn || true - - # check if link got lost - if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then - apt-get install --reinstall --yes amavisd-cn - fi - # start new packages - /etc/init.d/amavis restart + /etc/init.d/amavisd-cn restart } -# handle freerdius config files upgrade +# handle freerdius upgrade upgrade_freeradius () { - local template config_new password realm - - pkg freeradius-aai lt 2.1.3-0lenny0 || return 0 - - # handle static configs - restore_config freeradius-aai freeradius 2.1.3-0lenny0 \ - /etc/freeradius/clients.conf \ - /etc/freeradius/hints \ - /etc/freeradius/ldap.attrmap \ - /etc/freeradius/radiusd.conf - - # handle template based configs - template=/usr/share/carnet-upgrade/files/etc/freeradius/eap.conf.template - config_new=$(mktemp /var/lib/carnet-upgrade/eap.conf.XXXXXX) - password=$(grep -s '^[[:space:]]*private_key_password[[:space:]]*=' \ - /etc/freeradius/eap.conf) - cp $template $config_new - sed -i "s/.*#PASSWORD#.*/$password/" $config_new - if cmp -s $config_new /etc/freeradius/eap.conf >/dev/null; then - log "Restoring config file /etc/freeradius/eap.conf" - cp -v /usr/share/carnet-upgrade/files/etc/freeradius/eap.conf.restore \ - /etc/freeradius/eap.conf - fi - rm -f $config_new - - template=/usr/share/carnet-upgrade/files/etc/freeradius/proxy.conf.template - config_new=$(mktemp /var/lib/carnet-upgrade/proxy.conf.XXXXXX) - realm=$(sed -n '/^[[:space:]]*suffix[[:space:]]*/ { - s///; s/"//g; s/,dc=/./g; s/dc=//; s/.hr$//; p; q }' /etc/ldap/slapd.conf) - cp $template $config_new - sed -i "s/#REALM#/$realm/" $config_new - if cmp -s $config_new /etc/freeradius/proxy.conf >/dev/null; then - log "Restoring config file /etc/freeradius/proxy.conf" - cp -v /usr/share/carnet-upgrade/files/etc/freeradius/proxy.conf.restore \ - /etc/freeradius/proxy.conf - fi - rm -f $config_new - - # install the new packages - if ! apt-get -y install freeradius; then - # freeradius upgrade fails here, try to fix it by creating certificates - [ -x /etc/freeradius/certs/bootstrap ] && /etc/freeradius/certs/bootstrap - - dpkg --configure -a - apt-get -y -f install - fi + pkg freeradius-aai lt 2.1.10-1 || return 0 - # finally try to cleanup this mess + # 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 } -# prepare for slapd upgrade (caused by freeradius installation) -prepare_openldap () { - pkg openldap-aai lt 2.4 || return 0 - - # openldap-aai expects org.ldif to exists - local ldif=/var/lib/ldap/org.ldif - local ldif_backup=/var/lib/carnet-upgrade/org.ldif - if [ -f $ldif ]; then - cp -v $ldif $ldif_backup - fi -} - -# fix openldap-aai postinst user handling +# handle openldap upgrade upgrade_openldap () { - pkg openldap-aai lt 2.4 || return 0 - - # slapd postinst fails if move_old_database is false - echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections - pkgadd slapd - - # slapd removes org.ldif during switch from ldap -> openldap user - local ldif=/var/lib/ldap/org.ldif - local ldif_backup=/var/lib/carnet-upgrade/org.ldif - if [ -f $ldif_backup -a ! -f $ldif ]; then - cp -v $ldif_backup $ldif + # 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 - # openldap-aai postinst fails here because of database permissions - apt-get -y install openldap-aai || true - chown -R openldap:openldap /var/lib/ldap - /etc/init.d/slapd restart - dpkg --configure -a + # aai does not depend on the new openldap version + pkgadd slapd + pkgadd openldap-aai +} - # remove ldap user if openldap works - if getent passwd ldap > /dev/null && \ - getent passwd openldap > /dev/null && \ - pgrep -U openldap slapd > /dev/null - then - log "userdel ldap (replaced by openldap)" - userdel ldap || true +# handle mysql 5.0 to 5.1 upgrade +upgrade_mysql () { + if pkg mysql-server || pkg mysql-server-5.0; then + pkgadd mysql-server + dpkg -P mysql-server-5.0 + /etc/init.d/mysql restart fi } @@ -1109,13 +921,20 @@ upgrade_postgresql () { # upgrade the MTA upgrade_postfix () { - pkgadd postfix-cn + pkgadd sasl2-bin postfix-cn if pkg postgrey; then pkgrm postgrey # not used by postfix-cn anymore fi } +# upgrade bind separately so DNS is not down for too long +# or breaks postinst scripts of other cn packages that depend on +# working resolver +upgrade_bind() { + pkgadd bind9-cn +} + get_variable () { local name=$1 file=$2 val @@ -1127,44 +946,16 @@ get_variable () { echo $val } -# preserve mail location on upgrade -upgrade_dovecot () { - local default_mail_env mail_location - - # check if already upgraded - if ! pkg dovecot-common lt 1.0; then - return - fi - - # save old mail location - default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf) - - # silently upgrade package - restore_config dovecot-cn dovecot-common 1.0 /etc/dovecot/dovecot.conf - pkgadd dovecot-cn - - # insert old mail location - mail_location=$(get_variable mail_location /etc/dovecot/dovecot.conf) - if [ "$default_mail_env" -a ! "$mail_location" ]; then - check_and_sed '^#mail_location[[:space:]]*=' \ - "s|#mail_location[[:space:]]*=.*|mail_location = $default_mail_env|" /etc/dovecot/dovecot.conf || return 0 - - if [ -x /etc/init.d/dovecot ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - /usr/sbin/invoke-rc.d dovecot restart - else - /etc/init.d/dovecot restart - fi - fi - fi -} - # restore munin configs for silent upgrade 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.2.6-10~lenny1' || continue + pkg $pkg_name lt '1.4.5-3' || continue config=/etc/munin/$pkg_name.conf backup=$config.$backup_ext @@ -1184,45 +975,22 @@ upgrade_munin () { dpkg-reconfigure munin-cn } -# udev.preinst fails if devfs configs still exist -upgrade_udev () { - local config - - for config in /etc/udev/rules.d/devfs.rules \ - /etc/udev/rules.d/compat-full.rules \ - /etc/udev/rules.d/compat.rules - do - if [ -e $config ]; then - mv -v $config /etc/udev/ - fi - done - - if [ -f /etc/udev/udev.rules -a ! -f /etc/udev/rules.d/udev.rules ]; then - ln -sfv ../udev.rules /etc/udev/rules.d/ - fi - - pkgadd udev -} - -# fix /etc/dpkg/dpkg.cfg -comment_force_overwrite () { - if [ -f /etc/dpkg/dpkg.cfg ]; then - if check_and_sed '^force-overwrite' \ - 's,\(^force-overwrite\),#\1,' \ - /etc/dpkg/dpkg.cfg; then - notice "$msg_comment_force_overwrite" - fi - fi -} - +# try not to overwrite user modified issue files fix_issue () { - cat > /etc/issue </dev/null; then + cp -av /etc/issue /etc/issue.$backup_ext + cat > /etc/issue < /etc/issue.net </dev/null; then + cp -av /etc/issue.net /etc/issue.net.$backup_ext + cat > /etc/issue.net </dev/null \ | grep -q '^kernel-2.6-cn is already the newest version.$' then log "Not checking free space in /: kernel-2.6-cn already installed" @@ -1343,3 +1122,12 @@ round() { echo $num } + +# make sure carnet-upgrade doesn't get upgraded until the end +hold_carnet_upgrade() { + echo carnet-upgrade hold | dpkg --set-selections +} + +release_carnet_upgrade() { + echo carnet-upgrade install | dpkg --set-selections +}