X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=c223076c126a57711bf66c7210ac520e49a0e383;hb=ce3d7220e258efb1036e6656e534d82fb2678104;hp=0af728bf701decf0cbe1aadd0dfe5e9b1084cb6b;hpb=a97320a33fcf92f0c683b0830dbf700b88726a99;p=carnet-upgrade.git diff --git a/src/functions.sh b/src/functions.sh index 0af728b..c223076 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -105,7 +105,7 @@ pkgadd () { pkgrm () { [ -n "$*" ] || return 0 - log "Removing $* ..." + log "Purging $* ..." apt-get -y$s --purge remove $* || { dpkg --configure -a apt-get -yf install @@ -113,6 +113,17 @@ pkgrm () { } } +pkgrm_only () { + [ -n "$*" ] || return 0 + log "Removing $* ..." + apt-get -y$s remove $* || { + dpkg --configure -a + apt-get -yf install + apt-get -y$s remove $* + } +} + + apt_update() { log "Running apt-get update ..." apt-get -y$s update || { @@ -202,6 +213,57 @@ remove_bloat() { eval pkgrm $pkgs_to_remove } +remove_cn_bloat() { + local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs + + # get installed packages + installed=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX) + COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' >$installed + + # detect installed CN packagees + for pkg in $(echo "$cn_bloats" | cut -d' ' -f1); do + if grep -qx $pkg $installed; then + cn_pkgs="$cn_pkgs $pkg" + dialog_list="$dialog_list $pkg '' off" + fi + done + rm -f $installed + + # report status or finish if no CN packages found + if [ "$cn_pkgs" ]; then + log "Found CN packages:$cn_pkgs" + else + log "No CN packages found." + return + fi + + # user selects the packages to delete + selection=$(mktemp /var/lib/carnet-upgrade/selection.XXXXXX) + eval LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" \ + --checklist \""$msg_remove_cn_bloat"\" 20 75 6 $dialog_list 2>$selection + + # expand the package list to include the services + for pkg in $(cat $selection); do + pkg=${pkg%\"} + pkg=${pkg#\"} + cn_del="$cn_del $pkg" + to_del=$(echo "$cn_bloats" | grep ^$pkg) + del_pkgs="$del_pkgs $to_del" + done + rm -f $selection + + # report selection or finish if no service selected + if [ "$cn_del" ]; then + log "Removing CN services:$cn_del" + else + log "No CN services selected for removal." + return + fi + + # delete the cn packages and relevant services + pkgrm_only $del_pkgs +} + post_upgrade() { touch "$post_upgrade_queuetab" if ! grep -q "true $*" "$post_upgrade_queuetab"; then @@ -303,11 +365,11 @@ what_upgrade () { # funkcija za ispis paketa koje treba upgradeati check_upgrade () { local upgrade - upgrade="`what_upgrade`" + upgrade=${1:-"`what_upgrade`"} if [ "$upgrade" ]; then notice " -Prije prelaska na Debian Etch potrebno je napraviti nadogradnju ovih paketa: +Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju ovih paketa: $upgrade Pokrenite: @@ -323,6 +385,61 @@ 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 + + packages=$(mktemp /var/lib/carnet-upgrade/Packages.XXXXXX) + if wget -q -O$packages $packages_uri; then + latest_version=$(sed -ne \ + '/Package: carnet-upgrade/,/Description:/{ /Version: /s///p }' \ + $packages) + rm -f $packages + + if [ "$latest_version" ]; then + log "Running carnet-upgrade version is $version" + log "Latest carnet-upgrade version is $latest_version" + if dpkg --compare-versions "$version" lt "$latest_version"; then + check_upgrade " carnet-upgrade" + else log "Already using the latest carnet-upgrade version."; fi + else log "Failed to get latest version, skipping check."; fi + else log "Failed to download Packages file, skipping check."; fi + + rm -f $packages +} + # if apache is installed make sure it's version 2 check_apache_version () { @@ -340,6 +457,92 @@ Nakon toga ponovno pozovite ovu skriptu." 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]}" ] || reboot_required; 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 if the latest kernel is booted +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; }' ) + fi + + # fallback to grub if lilo not installed + if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then + default_kernel=$( awk ' + $1 == "default" { default = $2; + if (default != /^[[:digit:]]+$/) { exit } } + $1 == "title" { title+=1 } + $1 == "kernel" && title==default+1 { print $2; exit }' \ + /boot/grub/menu.lst 2>/dev/null ) + fi + + if [ -z "$default_kernel" ]; then + log "Could not find default kernel" + return 1 + fi + + log "Default kernel image: $default_kernel" + + if [ ! -e "$default_kernel" ]; then + log "Default kernel image doesn't exist!?" + return 1 + fi + + kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 ) + + if [ -z "$kernel_package" ]; then + log "Default kernel not installed from a package" + return 1 + fi + + 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" + + if grep -q "$running_release .* $running_version" $default_kernel; then + log "Latest kernel version is running." + return 1 + else + log "Reboot to latest version required." + return 0 + fi +} + upgrade () { local i to_install packages case "$1" in @@ -489,25 +692,45 @@ fix_etc_default_raid2 () { # restore original config file (if the new package version is not # installed already) restore_config () { - local file file_backup file_orig - local old_umask + local file file_backup file_expect file_restore config_changed + local cn_package cn_version package version + + # check if new package version is installed + cn_package=$1 + package=$2 + version=$3 + + if [ "$cn_package" ]; then + if ! pkg $cn_package; then + # do nothing if cn package is not installed + return 0 + fi + fi - # create new files safely - old_umask=`umask` - umask 0077 + 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 + fi + fi + shift 3 # restore package files for file in $*; do - file_orig=/usr/share/carnet-upgrade/files/$file + 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 there - if [ ! -e $file ]; then + # 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_orig $file >/dev/null; then + if ! cmp $file_expect $file >/dev/null; then continue fi @@ -516,72 +739,107 @@ restore_config () { log "Restoring config file $file" # backup local changes - mv -v $file $file_backup + cp -av $file $file_backup # restore original - cp -av $file_orig $file - chown --reference $file_backup $file - chmod --reference $file_backup $file + cp -v $file_restore $file + + config_changed=1 fi done - umask $old_umask + # 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 eq $cn_version && dpkg-reconfigure $cn_package" + 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 - pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net - pkg libpam-modules lt 0.79 && restore_config /etc/security/limits.conf - pkg login lt 1:4.0.18.1 && restore_config /etc/pam.d/login - pkg mysql-server lt 5.0.3 && restore_config /etc/init.d/mysql \ - /etc/logrotate.d/mysql-server \ - /etc/mysql/my.cnf - pkg ntp lt 1:4.2.2 && restore_config /etc/ntp.conf - pkg ntpdate lt 1:4.2.2 && restore_config /etc/default/ntpdate - pkg oidentd lt 2.0.8 && restore_config /etc/default/oidentd - pkg postgrey lt 1.27 && restore_config /etc/default/postgrey \ - /etc/postgrey/whitelist_clients - pkg procps lt 1:3.2.7 && restore_config /etc/sysctl.conf - pkg sasl2-bin lt 2.1.22 && restore_config /etc/default/saslauthd - pkg slapd lt 2.3.30 && restore_config /etc/default/slapd /etc/init.d/slapd - pkg squirrelmail lt 2:1.4.9a && restore_config /etc/squirrelmail/apache.conf - pkg vsftpd lt 2.0.5 && restore_config /etc/vsftpd.conf - pkg xinetd lt 1:2.3.14 && restore_config /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 + # 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 + + # 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) + hostname=$(hostname) + domain=$(hostname --domain) + + # generate config from template + cp $template $config_new + 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 + rm -f $config_new 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 +# 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 @@ -610,10 +868,10 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { - pkgadd carnet-keyring srce-keyring + pkgadd carnet-keyring srce-keyring debian-archive-keyring pkgadd dpkg apt debconf python-apt - dpkg-reconfigure carnet-keyring srce-keyring + dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring apt_update } @@ -678,10 +936,12 @@ upgrade_apache2 () { upgrade_amavis () { local conf - # remove init script diversion - if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then - rm -vf /etc/init.d/amavis - dpkg-divert --quiet --remove /etc/init.d/amavis + # remove init script diversion before upgrade + if pkg amavisd-cn lt 3:2.4.2-4; 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 @@ -699,6 +959,11 @@ upgrade_amavis () { '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 } @@ -779,7 +1044,7 @@ upgrade_dovecot () { default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf) # silently upgrade package - restore_config /etc/dovecot/dovecot.conf + restore_config dovecot-cn dovecot-common 1.0 /etc/dovecot/dovecot.conf pkgadd dovecot-cn # insert old mail location @@ -798,6 +1063,51 @@ upgrade_dovecot () { fi } +# restore munin configs for silent upgrade +upgrade_munin () { + local config backup hostname domain + + for pkg_name in munin munin-node; do + pkg $pkg_name lt '1.2.6-10~lenny1' || continue + + config=/etc/munin/$pkg_name.conf + backup=$config.$backup_ext + if [ -f $config -a ! -f $backup ]; then + hostname=$(hostname) + domain=$(hostname --domain) + + cp -av $config $backup + check_and_sed "$hostname.$domain" \ + "s/$hostname.$domain/localhost.localdomain/g" $config + fi + pkgadd $pkg_name + done + + # force localhost -> hostname replacement in config files + pkgadd munin-cn + 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 @@ -811,11 +1121,11 @@ comment_force_overwrite () { fix_issue () { cat > /etc/issue < /etc/issue.net <