restore_file /etc/monit/monitrc $config_new
rm -f $config_new
fi
-
-# 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
# upgrade apache2/php5 to lenny
upgrade_apache2 () {
+ pkgrm apache-common # prevents installation of apache2-suexec
pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
php5-odbc php5-suhosin php-suhosin-cn
}