From: Valentin Vidic <vvidic@carnet.hr>
Date: Mon, 31 Mar 2008 08:40:55 +0000 (+0200)
Subject: Let dpkg/admin decide on bind and php.ini config changes.
X-Git-Tag: debian/4.0.1~9
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=ef77c3319e1d5234b7e0a4974c8401bbf8039ec9;p=carnet-upgrade.git

Let dpkg/admin decide on bind and php.ini config changes.
---

diff --git a/src/functions.sh b/src/functions.sh
index b595580..1d83c80 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -493,7 +493,6 @@ restore_configs () {
   local config_backup
 
   pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net
-  pkg bind9 lt 1:9.3.4 && restore_config /etc/bind/named.conf.options
   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 \
@@ -533,11 +532,7 @@ restore_configs () {
   # register cn changes in ucf managed files
   for config in /etc/apache/modules.conf \
                 /etc/clamav/clamd.conf \
-                /etc/clamav/freshclam.conf \
-                /etc/php4/apache2/php.ini \
-                /etc/php4/apache/php.ini \
-                /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini
+                /etc/clamav/freshclam.conf
   do 
       config_backup=$config.$backup_ext
       if [ -e $config -a ! -e $config_backup ]; then