Install new package monit-cn.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 7afb24a..81c2a78 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -35,7 +35,7 @@ find_id() {
   ids=$(getent $db | awk -F: "\$3 >= $first && \$3 <= $last {print \$3}")
   for i in $(seq $first $last)
   do
-    if ! echo $ids |grep -q $i; then
+    if ! echo $ids | grep -q $i; then
       echo $i
       return 0
     fi
@@ -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
@@ -366,7 +383,7 @@ backup_slapd_db () {
       umask $old_umask
       /etc/init.d/slapd start || true
 
-      if [ "$result" eq 0 ]; then
+      if [ "$result" -eq 0 ]; then
         log "$ldap_backup created"
         notice "Napravljen backup slapd baze u $ldap_backup."
       else
@@ -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 \