From 05a47ff27b8019fea469c89f1a6b89b3a2bff7f6 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Wed, 3 Sep 2014 15:31:49 +0530 Subject: [PATCH] Changed Dovcot Repo --- .../stack/install/mail/ee_mod_install_dovecot.sh | 11 +++++++++-- src/modules/stack/install/mail/ee_mod_repo_dovecot.sh | 8 +------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modules/stack/install/mail/ee_mod_install_dovecot.sh b/src/modules/stack/install/mail/ee_mod_install_dovecot.sh index 18bc1f38..09225e4b 100644 --- a/src/modules/stack/install/mail/ee_mod_install_dovecot.sh +++ b/src/modules/stack/install/mail/ee_mod_install_dovecot.sh @@ -10,7 +10,14 @@ function ee_mod_install_dovecot() ee_lib_echo "Installing Dovecot, please wait..." debconf-set-selections <<< "dovecot-core dovecot-core/create-ssl-cert boolean yes" debconf-set-selections <<< "dovecot-core dovecot-core/ssl-cert-name string $(hostname -f)" - $EE_APT_GET install dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-mysql dovecot-sieve dovecot-managesieved \ - || ee_lib_error "Unable to install Dovecot, exit status = " $? + + # Debian 6 doesn't provide Dovecot 2.x + if [ "$EE_DEBIAN_VERSION" == "squeeze" ]; then + $EE_APT_GET -t squeeze-backports install dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-mysql dovecot-sieve dovecot-managesieved \ + || ee_lib_error "Unable to install Dovecot, exit status = " $? + else + $EE_APT_GET install dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-mysql dovecot-sieve dovecot-managesieved \ + || ee_lib_error "Unable to install Dovecot, exit status = " $? + fi } diff --git a/src/modules/stack/install/mail/ee_mod_repo_dovecot.sh b/src/modules/stack/install/mail/ee_mod_repo_dovecot.sh index 677fb1a1..5f27164b 100644 --- a/src/modules/stack/install/mail/ee_mod_repo_dovecot.sh +++ b/src/modules/stack/install/mail/ee_mod_repo_dovecot.sh @@ -5,15 +5,9 @@ function ee_mod_repo_dovecot() if [ "$EE_DEBIAN_VERSION" == "squeeze" ];then # Add Dovecot repository - # Ref:http://wiki2.dovecot.org/PrebuiltBinaries - ee_lib_echo "Adding Dovecot repository, please wait..." - echo "deb http://xi.rename-it.nl/debian/ oldstable-auto/dovecot-2.2 main" > /etc/apt/sources.list.d/dovecot-$(lsb_release -sc).list \ + echo "deb http://http.debian.net/debian-backports squeeze-backports main" > /etc/apt/sources.list.d/dovecot-$(lsb_release -sc).list \ || ee_lib_error "Unable to add Dovecot repository, exit status = " $? - # Fetch and install Dovecot GnuPG key - wget -O - http://xi.rename-it.nl/debian/archive.key | apt-key add - \ - || ee_lib_error "Unable to fetch Dovecot GnuPG key, exit status = " $? - fi }