From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 17 Jun 2009 13:10:28 +0000 (+0200)
Subject: No special handling for dovecot.
X-Git-Tag: debian/5.0.0~3
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=d3408f34d10c3b52d90b46293ec576a0a273b349;p=carnet-upgrade.git

No special handling for dovecot.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index d2f9d95..4dac0a7 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -39,7 +39,6 @@ pkg freeradius-aai		upgrade_freeradius
 pkg openldap-aai		upgrade_openldap
 pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
-pkg dovecot-cn			upgrade_dovecot
 pkg postfix-cn			upgrade_postfix
 # ntp i ntpdate se ne pokrenu ispravno bez lockanja
 pkg ntp && pkg ntpdate		pkgadd lockfile-progs
diff --git a/src/functions.sh b/src/functions.sh
index 9d074be..c5156e6 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1177,38 +1177,6 @@ get_variable () {
   echo $val
 }
 
-# preserve mail location on upgrade
-upgrade_dovecot () {
-  local default_mail_env mail_location
-
-  # check if already upgraded
-  if ! pkg dovecot-common lt 1.0; then
-      return
-  fi
-
-  # save old mail location
-  default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf)
-
-  # silently upgrade package
-  restore_file /etc/dovecot/dovecot.conf
-  pkgadd dovecot-cn
-
-  # insert old mail location
-  mail_location=$(get_variable mail_location /etc/dovecot/dovecot.conf)
-  if [ "$default_mail_env" -a ! "$mail_location" ]; then
-      check_and_sed '^#mail_location[[:space:]]*=' \
-                   "s|#mail_location[[:space:]]*=.*|mail_location = $default_mail_env|" /etc/dovecot/dovecot.conf || return 0
-
-      if [ -x /etc/init.d/dovecot ]; then
-          if [ -x /usr/sbin/invoke-rc.d ]; then
-              /usr/sbin/invoke-rc.d dovecot restart
-          else
-              /etc/init.d/dovecot restart
-          fi
-      fi
-  fi
-}
-
 # restore munin configs for silent upgrade
 upgrade_munin () {
   local config backup hostname domain