Install new package monit-cn.

Updated requred package versions.
Added function to check if apache is upgraded to version 2.
Added php.ini config for apache2.
Removed old headers from scripts.

diff --git a/doc/carnet-upgrade.sgml b/doc/carnet-upgrade.sgml
index 682718e..e2999c9 100644 (file)
--- a/doc/carnet-upgrade.sgml
+++ b/doc/carnet-upgrade.sgml
@@ -415,9 +415,7 @@ deb http://ftp.carnet.hr/carnet-debian sarge main non-free
           <item><file>/etc/mysql/my.cnf</file>
           <item><file>/etc/ntp.conf</file>
           <item><file>/etc/pam.d/*</file>
-          <item><file>/etc/php4/apache/php.ini</file>
-          <item><file>/etc/php4/cgi/php.ini</file>
-          <item><file>/etc/php4/cli/php.ini</file>
+          <item><file>/etc/php4/*</file>
           <item><file>/etc/postgresql/postmaster.conf</file>
           <item><file>/etc/postgresql/postgresql.conf</file>
           <item><file>/etc/proftpd.conf</file>
@@ -589,9 +587,7 @@ deb http://ftp.carnet.hr/carnet-debian sarge main non-free
           <item><file>/etc/mysql/my.cnf</file>
           <item><file>/etc/ntp.conf</file>
           <item><file>/etc/pam.d/*</file>
-          <item><file>/etc/php4/apache/php.ini</file>
-          <item><file>/etc/php4/cgi/php.ini</file>
-          <item><file>/etc/php4/cli/php.ini</file>
+          <item><file>/etc/php4/*</file>
           <item><file>/etc/postgresql/postmaster.conf</file>
           <item><file>/etc/postgresql/postgresql.conf</file>
           <item><file>/etc/proftpd.conf</file>

diff --git a/src/actions/apt.queue b/src/actions/apt.queue
index 5ff786c..d81c471 100644 (file)
--- a/src/actions/apt.queue
+++ b/src/actions/apt.queue
@@ -1,4 +1,2 @@
-# last update: 2005-07-03
-#
 # Konfiguracija apt-a
 true                           create_sources_list

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 39044b2..de4e35a 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,6 +1,4 @@
-# last update: 2005-01-07
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
+# Full upgrade
 true                           first_warning
 true                           check_upgrade
 true                           remove_bloat
@@ -35,6 +33,7 @@ true                          dist_upgrade            # instaliraj ostatak
 # i ostatak
 true                           debconf_priority reset
 true                           add_group_proc          # za oidentd
+true                           pkgadd monit-cn
 pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
 true                           apt_listchanges enable
 # ovo bi trebalo biti predzadnje na popisu

diff --git a/src/actions/new.queue b/src/actions/new.queue
index fbae4d9..041251c 100644 (file)
--- a/src/actions/new.queue
+++ b/src/actions/new.queue
@@ -1,7 +1,2 @@
-# last update: 2005-07-03
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
-#
-# samo ispravke dodane nakon 2.1-1, bez instalacije nove funckionalnosti
+# samo ispravke dodane nakon nove verzije, bez instalacije nove funckionalnosti
 # uglavnom forsirani upgradei
-#

diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue
index 90468c0..f7d8518 100644 (file)
--- a/src/actions/post_upgrade.queue
+++ b/src/actions/post_upgrade.queue
@@ -1,7 +1,3 @@
-# last update: 2005-01-04
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
-#
 # samo akcije za nakon upgradea, moze se slobodno izvrsiti na bilo kojem etchu.
 #
 # s obzirom da ne znamo koja verzija paketa je radila upgrade, i ovdje treba

diff --git a/src/actions/upgrade.queue b/src/actions/upgrade.queue
index ed084db..8854fab 100644 (file)
--- a/src/actions/upgrade.queue
+++ b/src/actions/upgrade.queue
@@ -1,7 +1,3 @@
-# last update: 2005-06-30
-# Ivan 'ico' Rako <irako@srce.hr>
-# Zoran Dzelajlija <jelly@srce.hr>
-#
 # akcije za update etch instalacije, slicno post_upgrade
 # veci broj paketa koji se ne daju upgradeati s obicnim
 # apt-get upgrade se forsirano upgradea

diff --git a/src/cn-upgrade b/src/cn-upgrade
index c5f5e40..4fb7fd6 100755 (executable)
--- a/src/cn-upgrade
+++ b/src/cn-upgrade
@@ -25,9 +25,9 @@ fi
 
 cnup="/usr/share/carnet-upgrade"
 
+. ${ROOT}${cnup}/data.sh
 . ${ROOT}${cnup}/messages.sh
 . ${ROOT}${cnup}/functions.sh
-. ${ROOT}${cnup}/data.sh
 
 main_queuetab="${cnup}/actions/main.queue"
 post_upgrade_queuetab="/var/lib/carnet-upgrade/post_upgrade.queue"

diff --git a/src/data.sh b/src/data.sh
index e472320..1622fe8 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -7,30 +7,29 @@ backup_ext=cn4-upgrade
 # carnet-upgrade aborts if these packages are not up to date
 # name         wanted version
 needed_versions='
-amavisd-cn     20030616p10-12
-apache-cn      1.3.33-5
-bind9-cn       9.2.4-1
-clamav-cn      0.91.2-1
-dovecot-cn     0.99.14-0
-iptables-cn    1.2.11-6
-kernel-2.6-cn  2.6.22.9-1
-mysql-cn       4.0.24-10.5
-ntp-cn 4.2.0a+stable-2sarge1.1
-openssh-cn     3.8p1-8
-php4-cn        4.3.11-6
-postfix-cn     2.1.5-11
-procmail-cn    3.22-2
-razor-cn       2.361-0
-samba-cn       3.0.10-1
-spamassassin-cn        3.1.7-3
-squirrelmail-cn        1.4.4-5
-vsftpd-cn      2.0.3-1
-xinetd-cn      2.3.13-1
+amavisd-cn     2:20030616p10-12
 aosi-aai       1.6.3
 aosi-www-aai   1.5.7sarge0
+apache-cn      2:1.3.33-5
+bind9-cn       2:9.2.4-1
+clamav-cn      2:0.91.2-2
+dovecot-cn     0.99.14-0
 freeradius-aai 1.1.7-0
+iptables-cn    2:1.2.11-6
+kernel-2.6-cn  2.6.24-1
+mysql-cn       2:4.0.24-10.5
+ntp-cn 2:4.2.0a+stable-2sarge1.1
 openldap-aai   2.2.23-13
-mysql-common   4.0.24-10sarge3
+openssh-cn     2:3.8p1-8
+php4-cn        4:4.3.11-7
+postfix-cn     2.1.5-11
+procmail-cn    2:3.22-2
+razor-cn       2:2.361-0
+samba-cn       2:3.0.10-1
+spamassassin-cn        2:3.1.7-3
+squirrelmail-cn        2:1.4.4-5
+vsftpd-cn      2.0.3-1
+xinetd-cn      2:2.3.13-1
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
@@ -40,33 +39,33 @@ packages_first='
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
+amavis-stats-cn
 amavisd-cn
-php5-cn
-squirrelmail-cn
-mysql-cn
+aosi-aai
+aosi-www-aai
 bind9-cn bind9
-openssh-cn openssh-server              
 clamav-cn clamav-daemon
-spamassassin-cn        spamassassin razor dcc-client
-postfix-cn
 dovecot-cn
-squirrelmail-cn
-openldap-aai
 freeradius-aai freeradius
-aosi-aai
-aosi-www-aai
-ntp-cn
-vsftpd-cn vsftpd
-xinetd-cn xinetd       
+libkrb5-17-heimdal
 monit-cn
 munin-cn
-ossec-hids-cn
-amavis-stats-cn
-webalizer-cn
+mysql-cn
+ntp-cn
 oidentd
+openldap-aai
+openssh-cn openssh-server              
+ossec-hids-cn
 php4-odbc
 php4-xslt
-libkrb5-17-heimdal
+php5-cn
+postfix-cn
+spamassassin-cn        spamassassin razor dcc-client
+squirrelmail-cn
+squirrelmail-cn
+vsftpd-cn vsftpd
+webalizer-cn
+xinetd-cn xinetd       
 '
 
 # We want to remove these packages, used in remove_bloat()

diff --git a/src/functions.sh b/src/functions.sh
index 320ba37..81c2a78 100644 (file)
--- 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 \

diff --git a/src/scripts/check_services b/src/scripts/check_services
index 3780f23..c097493 100755 (executable)
--- a/src/scripts/check_services
+++ b/src/scripts/check_services
@@ -1,16 +1,12 @@
 #!/bin/sh
-# last update: 2004-12-20
-# last update: 2005-01-07 razlicita msg_finished poruka, ovisno o $queuename
-# Zoran 'jelly' Dzelajlija <jelly@srce.hr>
-# Ivan 'ico' Rako <irako@srce.hr>
 
 # Load debconf stuff
 . /usr/share/debconf/confmodule
 
 # Load nase funkcije
-. /usr/share/carnet-upgrade/functions.sh
-. /usr/share/carnet-upgrade/messages.sh
 . /usr/share/carnet-upgrade/data.sh
+. /usr/share/carnet-upgrade/messages.sh
+. /usr/share/carnet-upgrade/functions.sh
 
 # provjeri da li su paketi iz prvog polja instalirani i to strpaj u debconf
 cs_preupgrade () {

diff --git a/src/scripts/debconf_priority b/src/scripts/debconf_priority
index f7809c9..3b70444 100755 (executable)
--- a/src/scripts/debconf_priority
+++ b/src/scripts/debconf_priority
@@ -1,8 +1,4 @@
 #!/bin/sh
-# last update: 2004-12-19
-# Zoran 'jelly' Dzelajlija <jelly@srce.hr>
-# Ivan 'ico' Rako <irako@srce.hr>
-
 
 # Load debconf stuff
 . /usr/share/debconf/confmodule