From bf6e2a53d68e0eb92c170a04747cc18c28df84d5 Mon Sep 17 00:00:00 2001
From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Mon, 27 Apr 2009 17:25:14 +0200
Subject: [PATCH] Force PHP 5 upgrade.

---
 doc/carnet-upgrade-src.sgml |   32 ++++++++++++++++++++++++++++++++
 src/actions/main.queue      |    1 +
 src/functions.sh            |   14 +++++++-------
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/doc/carnet-upgrade-src.sgml b/doc/carnet-upgrade-src.sgml
index 1bb3827..45af29d 100644
--- a/doc/carnet-upgrade-src.sgml
+++ b/doc/carnet-upgrade-src.sgml
@@ -221,6 +221,38 @@ CN: run_actions (main) started...
 </example>
         </p>
 
+         <p>
+        Prije nadogradnje na <em>lenny</em>, potrebno je izvršiti
+        prijelaz sa PHP inačice 4 na PHP 5. Ukoliko je na
+        sustavu još uvijek instaliran PHP 4 pojavit će se
+        poruka:
+
+<example>
++-----------------------------------------------------------------+
+| Nadogradnja CARNet Debian Etch->Lenny                           |
++-----------------------------------------------------------------+
+|                                                                 |
+| Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju|
+| sa PHP 4 na PHP 5.                                              |
+|                                                                 |
+| Pokrenite:                                                      |
+|   # apt-get update                                              |
+|   # apt-get install php5-cn                                     |
+|                                                                 |
+| Nakon sto provjerite da sve web aplikacije rade ispravno,       |
+| ponovno pozovite ovu skriptu.                                   |
+|                                                                 |
++-----------------------------------------------------------------+
+|                           < U redu >                            |
++-----------------------------------------------------------------+
+</example>
+
+        Lokalne izmjene u PHP 4 konfiguraciji treba ručno prenijeti
+        u PHP 5 konfiguraciju. Također je potrebno instalirati PHP 5 inačice
+        dodataka koji se koriste u web aplikacijama 
+        (npr. <package>php5-mysql</package>, <package>php5-ldap</package>).
+        </p>
+
         <p>
         U sljedećem koraku biti će izvršena provjera dali su najvažniji
         servisi nadograđeni na najnovije inačice u <em>etch</em>
diff --git a/src/actions/main.queue b/src/actions/main.queue
index 4dc3cfd..b9746a0 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,6 +1,7 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
 true				check_reboot
diff --git a/src/functions.sh b/src/functions.sh
index 1524f96..ff90033 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -447,19 +447,19 @@ check_my_version () {
   rm -f $packages
 }
 
-# if apache is installed make sure it's version 2
-check_apache_version () {
+# if php is installed make sure it's version 5
+check_php_version () {
 
-  if pkg apache-cn && ! pkg apache2-cn; then
+  if pkg php4-cn && ! pkg php5-cn; then
     notice "
-Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa PHP 4 na PHP 5.
 
 Pokrenite:
   # apt-get update
-  # apt-get install apache2-cn
+  # apt-get install php5-cn
   
-Nakon toga ponovno pozovite ovu skriptu."
-    log "carnet-upgrade aborted, upgrade to apache2-cn needed."
+Nakon sto provjerite da sve web aplikacije rade ispravno, ponovno pozovite ovu skriptu."
+    log "carnet-upgrade aborted, upgrade to php5-cn needed."
     exit 1
   fi
 }
-- 
1.7.10.4