Commits

Zhang Huangbin  committed 3afa475

Use Dovecot-2.0 instead of 1.2.x on openSUSE-12.1.

  • Participants
  • Parent commits e04468d

Comments (0)

Files changed (6)

File iRedMail/ChangeLog

 iRedMail-0.8.0-beta3:
+    * Use Dovecot-2.0 instead of 1.2.x on openSUSE-12.1.
     * Drop support for below distributions and releases:
         + Debian 5 (Lenny)
         + Ubuntu 8.x, 9.x, 10.10, 11.04

File iRedMail/conf/dovecot

     fi
     export DOVECOT_DELIVER='/usr/libexec/dovecot/deliver'
 elif [ X"${DISTRO}" == X"SUSE" ]; then
-    # openSUSE 12.1 and later versions ship 1.2.x and 2.0.x
-    export DOVECOT_VERSION='1.2'
+    # openSUSE 12.1 and later versions ship 2.0.x
+    export DOVECOT_VERSION='2'
 
     export DOVECOT_CONF='/etc/dovecot/dovecot.conf'
     export DOVECOT_LDAP_CONF='/etc/dovecot/dovecot-ldap.conf'

File iRedMail/conf/global

 
 # Exit and prompt to use a supported Linux/BSD distribution
 if [ X"${UNSUPPORTED_RELEASE}" == X'YES' ]; then
-    echo "********* ERROR *********"
-    echo "Release version of ${DISTRO} on this server is unsupported by iRedMail,"
-    echo "please refer to below web page to get list of supported versions."
-    echo "http://www.iredmail.org/download.html"
-    echo "********* ERROR *********"
+    cat <EOF
+********* ERROR *********
+Release version of the operating system on this server is unsupported by iRedMail,
+please access below link to get the latest iRedMail and a list of supported
+Linux/BSD distributions and release versions.
+
+http://www.iredmail.org/download.html
+
+*************************
+EOF
+
     exit 255
 fi
 

File iRedMail/functions/dovecot1.sh

 
 dovecot_config()
 {
-    ECHO_INFO "Configure Dovecot (pop3/imap server)."
+    ECHO_INFO "Configure Dovecot (pop3/imap server, version ${DOVECOT_VERSION})."
 
     [ X"${ENABLE_DOVECOT}" == X"YES" ] && \
         backup_file ${DOVECOT_CONF} && \

File iRedMail/functions/dovecot2.sh

 
 dovecot2_config()
 {
-    ECHO_INFO "Configure Dovecot (pop3/imap server)."
+    ECHO_INFO "Configure Dovecot (pop3/imap server, version ${DOVECOT_VERSION})."
 
     [ X"${ENABLE_DOVECOT}" == X"YES" ] && \
         backup_file ${DOVECOT_CONF} && \

File iRedMail/functions/packages.sh

         DISABLED_SERVICES="${DISABLED_SERVICES} saslauthd"
 
     elif [ X"${DISTRO}" == X"SUSE" ]; then
-        ALL_PKGS="${ALL_PKGS} dovecot12"
+        ALL_PKGS="${ALL_PKGS} dovecot20"
 
         if [ X"${BACKEND}" == X"MYSQL" ]; then
-            ALL_PKGS="${ALL_PKGS} dovecot12-backend-mysql"
+            ALL_PKGS="${ALL_PKGS} dovecot20-backend-mysql"
         elif [ X"${BACKEND}" == X"PGSQL" ]; then
-            ALL_PKGS="${ALL_PKGS} dovecot12-backend-pgsql"
+            ALL_PKGS="${ALL_PKGS} dovecot20-backend-pgsql"
         fi
 
     elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then