X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=usr%2Fshare%2Fcarnet-upgrade%2Ffunctions.sh;h=54e89032b9aa73c8b8a0fdffb45ffc198fbfe34c;hb=9e8ab2c99a8eb59f0a500734371be21e10fe39c8;hp=cd2bc5687397e7112cf48a17f56a8dd3e4d96cc8;hpb=443e7578837f8011f7121d6f6406a40e8db88928;p=carnet-upgrade.git

diff --git a/usr/share/carnet-upgrade/functions.sh b/usr/share/carnet-upgrade/functions.sh
index cd2bc56..54e8903 100644
--- a/usr/share/carnet-upgrade/functions.sh
+++ b/usr/share/carnet-upgrade/functions.sh
@@ -305,7 +305,7 @@ upgrade () {
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
     [ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn3-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn3-upgrade
-    cp /usr/share/carnet-upgrade/files/sources.list /etc/apt
+    cp /usr/share/carnet-upgrade/files/etc/apt/sources.list /etc/apt
     notice "Novi sadrzaj datoteke /etc/apt/sources.list:
 
 `cat /etc/apt/sources.list`"
@@ -334,7 +334,7 @@ add_group_proc () {
 
 # backup_slapd_db
 backup_slapd_db () {
-  local ldap_backup=/var/backup/slapcat.cn3-upgrade
+  local ldap_backup=/var/backups/slapcat.cn3-upgrade
 
   if [ ! -f $ldap_backup ]; then
     [ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius stop || true
@@ -392,18 +392,18 @@ restore_config () {
 
   for file in "$@"; do
     # backup changes
-    if [ -f "$file" -a ! -f "$file.cn3-upgrade" ]; then
+    if [ -e "$file" -a ! -e "$file.cn3-upgrade" ]; then
       mv "$file" "$file.cn3-upgrade"
     fi
 
     # install original
-    cp "/usr/share/carnet/upgrade/files/$file" "$file"
+    cp "/usr/share/carnet-upgrade/files/$file" "$file"
   done
 }
 
 # upgrade apache -> apache2
-install_apache2 () {
-  # bugfix za apache2-cn postinst
+upgrade_apache () {
+  # bugfix for apache2-cn postinst
   mkdir -p /etc/apache2
   touch /etc/apache2/httpd.conf
 
@@ -411,6 +411,15 @@ install_apache2 () {
   pkgadd apache2 squirrelmail apache2-cn squirrelmail-cn
 }
 
+# restore amavis init script
+restore_amavis_init () {
+  # remove diversion
+  if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
+    rm -f /etc/init.d/amavis
+    dpkg-divert --remove --package amavis-cn --rename /etc/init.d/amavis --quiet
+  fi 
+}
+
 # instaliraj zadnji freeradius; uvjeti u queue fileovima
 install_freeradius () {
   pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0