X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=81c2a78f3ca72c4c5b9d24000f476d66c95ec4fd;hb=2e767d4b5b56762a785df22c2cc0de7d63aa3cff;hp=320ba37a104d7bed19af14a6bb7eb1afdd57e38c;hpb=c8c1f75a9fd961a2547cfb9dee121f5c7d1558d1;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 320ba37..81c2a78 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -277,6 +277,23 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# if apache is installed make sure it's version 2
+check_apache_version () {
+
+  if ! pkg apache2-cn && pkg apache-cn; then
+    notice "
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa apache 1.3
+na apache 2.0.
+
+Pokrenite:
+  'apt-get install apache2-cn'
+  
+Nakon toga ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, upgrade to apache2-cn needed."
+    exit 1
+  fi
+}
+
 upgrade () {
   local to_install packages
   case "$1" in
@@ -469,6 +486,7 @@ restore_configs () {
   restore_config bind9 1:9.3.4 /etc/bind/named.conf.options
   restore_config dovecot-common 1.0 /etc/dovecot/dovecot.conf
   restore_config libapache-mod-php4 6:4.4.4 /etc/php4/apache/php.ini
+  restore_config libapache2-mod-php4 6:4.4.4 /etc/php4/apache2/php.ini
   restore_config libpam-modules 0.79 /etc/security/limits.conf
   restore_config login 1:4.0.18.1 /etc/pam.d/login
   restore_config mysql-server 5.0.3 /etc/init.d/mysql \