+# restore modified config to their package defaults
+# so the upgrade doesn't complain so much
+restore_configs () {
+ restore_config /etc/bind/named.conf.options
+ restore_config /etc/default/ntpdate
+ restore_config /etc/default/oidentd
+ restore_config /etc/default/postgrey
+ restore_config /etc/default/saslauthd
+ restore_config /etc/default/slapd
+ restore_config /etc/dovecot/dovecot.conf
+ restore_config /etc/init.d/mysql
+ restore_config /etc/init.d/slapd
+ restore_config /etc/issue
+ restore_config /etc/issue.net
+ restore_config /etc/logrotate.d/mysql-server
+ restore_config /etc/mysql/my.cnf
+ restore_config /etc/ntp.conf
+ restore_config /etc/pam.d/login
+ restore_config /etc/php4/apache/php.ini
+ restore_config /etc/php4/cgi/php.ini
+ restore_config /etc/php4/cli/php.ini
+ restore_config /etc/postgrey/whitelist_clients
+ restore_config /etc/security/limits.conf
+ restore_config /etc/squirrelmail/apache.conf
+ restore_config /etc/sysctl.conf
+ restore_config /etc/vsftpd.conf
+ restore_config /etc/xinetd.conf
+
+ # orphaned config file - no owner
+ rm -f /etc/logcheck/ignore.d.server/imap
+
+ # aide switched to ucf, move old configs aside
+ for file in /etc/aide/aide.conf /etc/cron.daily/aide /etc/default/aide; do
+ [ ! -e "$file.cn3-upgrade" ] && mv "$file" "$file.cn3-upgrade"
+ rm -f "$file"