X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=33ac2602b04e082f7184ddf66dd60fbebc647fe3;hb=b31f79b9c72b7e548ed2a1b8e1fc7308fdad19a0;hp=40378f90a2ef39a3b304e3c4bd337519c885aeb5;hpb=59888b246232e73ee4f9995f3a9a3f57b128c9b5;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 40378f9..33ac260 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1,4 +1,3 @@
-# last update: 2005-07-03
 # Ivan 'ico' Rako <irako@srce.hr>
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 
@@ -28,7 +27,7 @@ log() {
 # find first free uid/gid in range
 # find_id passwd 100 999
 find_id() {
-  local db first last ids
+  local i db first last ids
   db=$1
   first=$2
   last=$3
@@ -129,8 +128,8 @@ dist_upgrade () {
 }
 
 remove_bloat() {
-  local to_remove add_this i j text to_show cmd tmpfile installed
-  local update_selections pkgs_to_deselect oldifs
+  local to_remove add_this i j n text to_show cmd tmpfile installed
+  local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
   text="$msg_remove_bloat"
 
   [ "$DEBUG" ] && set -x
@@ -202,7 +201,7 @@ run_post_upgrade() {
 ###
 
 run_actions() {
-  local line lineno lineno2 f n name action testmsg
+  local line lineno lineno2 f n name action checkmsg check
   [ "$DEBUG" ] && set -vx
   name="$1"
   f="$2"
@@ -226,16 +225,16 @@ run_actions() {
       lineno2=$(($lineno2+1))
       line=$(echo -n "$line"| sed 's/\\$//'; head -$lineno2 "$f" | tail -1)
     done
-    test=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $1}')
+    check=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $1}')
     action=$(echo "$line" | sed 's/		*/	/g'| awk -F'	' '{print $2}')
-    testmsg=""
-    [ "$test" != "true" ] && testmsg="if '$test'"
-    if eval $test; then
-      log "$(printf 'action %02d' $lineno) starting: '${action}' $testmsg "
+    checkmsg=""
+    [ "$check" != "true" ] && checkmsg="if '$check'"
+    if eval $check; then
+      log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
       eval $action
-      log "$(printf 'action %02d' $lineno) finished: '${action}' $testmsg"
+      log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
     else
-      log "$(printf 'action %02d' $lineno) skipping: '${action}' $testmsg"
+      log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg"
     fi
     [ "$lineno2" -gt "$lineno" ] && lineno=$lineno2
   done
@@ -271,9 +270,11 @@ Prije prelaska na Debian Etch potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
-  'apt-get dist-upgrade'
+  # apt-get update
+  # apt-get dist-upgrade
 ili:
-  'apt-get install${upgrade}'
+  # apt-get update
+  # apt-get install${upgrade}
   
 Nakon toga ponovno pozovite ovu skriptu."
     log "carnet-upgrade aborted, upgrade of$upgrade needed."
@@ -286,10 +287,11 @@ check_apache_version () {
 
   if pkg apache-cn && ! pkg apache2-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 Apache 1.3 na Apache 2.0.
 
 Pokrenite:
-  'apt-get install apache2-cn'
+  # apt-get update
+  # apt-get install apache2-cn
   
 Nakon toga ponovno pozovite ovu skriptu."
     log "carnet-upgrade aborted, upgrade to apache2-cn needed."
@@ -298,7 +300,7 @@ Nakon toga ponovno pozovite ovu skriptu."
 }
 
 upgrade () {
-  local to_install packages
+  local i to_install packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -310,7 +312,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $packages
+  for i in $(echo $packages)
   do
     pkg $i && to_install="$to_install $i"
   done
@@ -488,6 +490,8 @@ restore_config () {
 # restore modified config to their package defaults
 # so the upgrade doesn't complain so much
 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
@@ -526,15 +530,18 @@ restore_configs () {
       done
   fi
 
-  # register cn changes in apache files
-  for config in /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini \
-                /etc/php4/apache/php.ini \
+  # 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/apache/modules.conf
+                /etc/php4/apache/php.ini \
+                /etc/php4/cgi/php.ini \
+                /etc/php4/cli/php.ini
   do 
       config_backup=$config.$backup_ext
       if [ -e $config -a ! -e $config_backup ]; then
+          log "Saving config file $config"
           cp -av $config $config_backup
           ucf $config_backup $config
       fi
@@ -568,7 +575,7 @@ apt_listchanges () {
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
   pkgadd carnet-keyring srce-keyring
-  pkgadd dpkg apt debconf
+  pkgadd dpkg apt debconf python-apt
 
   dpkg-reconfigure carnet-keyring srce-keyring
   update
@@ -589,40 +596,36 @@ upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
 }
 
-# upgrade apache -> apache2
-upgrade_apache () {
-
-  # bugfix for apache2-cn postinst
-  mkdir -p /etc/apache2
-  touch /etc/apache2/httpd.conf
+# upgrade apache2 to etch
+upgrade_apache2 () {
+  local package packages
 
-  # temporary remove packages conflicting with apache2
-  delpkg=""
-  for p in aosi-aai aosi-www-aai \
-           php4-cn php4-odbc php4-xslt \
-           squirrelmail-cn; do
+  # php-suhosin-cn causes removal of applications on dist-upgrade
+  # because of php5 only dependencies
+  pkgrm php-suhosin-cn
 
-     # remember installed packages
-     if pkg $p; then
-         delpkg="$delpkg $p"
-     fi
+  for package in \
+      libapache2-mod-php4 \
+      php4-cli \
+      php4-cgi \
+      php4-cn \
+      apache2-cn \
+      php4-odbc \
+      php4-suhosin
+  do
+      if pkg $package; then
+          packages="$packages $package"
+      fi
   done
 
-  # remove (but not purge) problematic packages
-  if [ "$delpkg" ]; then
-      eval apt-get --yes remove $delpkg
-  fi
-
-  # remove old apache
-  pkgrm apache apache-common
-
-  # install new packages
-  eval pkgadd apache2-cn apache2-mpm-prefork \
-              php4-cn libapache2-mod-php4 \
-              $delpkg
+  for package in $(echo $packages); do
+      pkgadd $package
+  done
 }
 
 upgrade_amavis () {
+  local conf
+
   # remove init script diversion
   if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
     rm -vf /etc/init.d/amavis
@@ -630,7 +633,7 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  local conf=/etc/amavis/amavisd.conf
+  conf=/etc/amavis/amavisd.conf
   if [ -e $conf -a ! -e $conf.$backup_ext ]; then
     mv -v $conf $conf.$backup_ext
   fi
@@ -649,16 +652,58 @@ upgrade_amavis () {
 
 # fix openldap-aai postinst user handling
 upgrade_openldap () {
-  #pkgrm openldap-cn # deprecated
-  apt-get -y$s install openldap-aai || true # postinst fails
-  chown -R openldap:openldap /var/lib/ldap  # fix slapd
+  pkg openldap-aai lt 2.3 || return 0
+
+  # openldap-aai expects org.ldif to exists
+  local ldif=/var/lib/ldap/org.ldif
+  local ldif_backup=/var/lib/carnet-upgrade/org.ldif
+  if [ -f $ldif ]; then
+    cp -v $ldif $ldif_backup
+  fi
+
+  # slapd postinst fails if move_old_database is false
+  echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections 
+  pkgadd slapd
+
+  # slapd removes org.ldif during switch from ldap -> openldap user
+  if [ -f $ldif_backup -a ! -f $ldif ]; then
+    cp -v $ldif_backup $ldif
+  fi
+
+  # openldap-aai postinst fails here because of database permissions
+  apt-get -y install openldap-aai || true
+  chown -R openldap:openldap /var/lib/ldap
   /etc/init.d/slapd restart
-  dpkg --configure -a # try postinst again
+  dpkg --configure -a
+
+  # remove ldap user if openldap works
+  if getent passwd ldap      > /dev/null && \
+     getent passwd openldap  > /dev/null && \
+     pgrep -U openldap slapd > /dev/null
+  then
+     log "userdel ldap (replaced by openldap)"
+     userdel ldap || true
+  fi
+}
+
+# fix postgresql deinstallation during upgrade
+upgrade_postgresql () {
+  if check_services show 2>&1 | grep -qw postgresql; then
+     apt-get install -y postgresql || apt-get -yf install
+  fi
+}
+
+# upgrade the MTA
+upgrade_postfix () {
+  pkgadd postfix-cn
+
+  if pkg postgrey; then
+     pkgrm postgrey # not used by postfix-cn anymore
+  fi
 }
 
 get_variable () {
-  name=$1
-  file=$2
+  local name=$1 file=$2 val
 
   if [ -f "$file" ]; then
      val=$(sed -n "/^[[:space:]]*$name[[:space:]]*=/s/[[:space:]]*//gp" $file)