Commits

Zhang Huangbin committed ea8a387

Drop support for Debian 6 (squeeze).

  • Participants
  • Parent commits 39a534d

Comments (0)

Files changed (9)

File iRedMail/ChangeLog

+iRedMail-0.8.6:
+    * Drop support for below releases:
+        + Debian 6 (squeeze)
+
 iRedMail-0.8.5:
     * Use EPEL yum repo on RHEL/CentOS 6 by default.
     * Update SQL triggers to insert value for column 'used_quota.domain'

File iRedMail/conf/amavisd

 elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
     # Debian 7 (wheezy) and Ubuntu 13.04 (raring) ships Amavisd-new-2.7
     if [ X"${DISTRO}" == X'DEBIAN' ]; then
-        if [ X"${DISTRO_CODENAME}" != X'squeeze' ]; then
-            export AMAVISD_VERSION='2.7'
-        fi
+        export AMAVISD_VERSION='2.7'
     elif [ X"${DISTRO}" == X'UBUNTU' ]; then
         if [ X"${DISTRO_CODENAME}" != X'precise' ]; then
             export AMAVISD_VERSION='2.7'

File iRedMail/conf/dovecot

     export DOVECOT_DELIVER='/usr/lib/dovecot/deliver'
 
 elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
-    if [ X"${DISTRO_CODENAME}" == X'squeeze' ]; then
-        export DOVECOT_VERSION='1.2'
-    fi
-
     export DOVECOT_DELIVER='/usr/lib/dovecot/deliver'
 
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
     export DOVECOT_REALTIME_QUOTA_SQLTYPE='pgsql'
 fi
 
-if [ X"${DOVECOT_VERSION}" == X"1.2" ]; then
-    export DOVECOT_PROTOCOLS="pop3 pop3s imap imaps managesieve"
-else
-    export DOVECOT_PROTOCOLS="pop3 imap sieve"
-fi
+export DOVECOT_PROTOCOLS="pop3 imap sieve"

File iRedMail/conf/global

         export DISTRO_VERSION="$(cat /etc/debian_version)"
 
         # Set distro code name and unsupported releases.
-        if grep '^6' /etc/debian_version &>/dev/null; then
-            export DISTRO_VERSION='6'
-            export DISTRO_CODENAME='squeeze'
-        elif grep '^7' /etc/debian_version &>/dev/null || \
+        if grep '^7' /etc/debian_version &>/dev/null || \
             grep -i '^wheezy' /etc/debian_version &>/dev/null; then
             export DISTRO_VERSION='7'
             export DISTRO_CODENAME='wheezy'

File iRedMail/functions/packages.sh

         # Authentication modules
         ALL_PKGS="${ALL_PKGS} libapache2-mod-auth-mysql libapache2-mod-auth-pgsql"
 
-        if [ X"${DISTRO_CODENAME}" != X'squeeze' ]; then
-            if [ X"${BACKEND}" == X"OPENLDAP" ]; then
-                ALL_PKGS="${ALL_PKGS} php-net-ldap2"
-            fi
+        if [ X"${BACKEND}" == X"OPENLDAP" ]; then
+            ALL_PKGS="${ALL_PKGS} php-net-ldap2"
         fi
 
     elif [ X"${DISTRO}" == X'GENTOO' ]; then
         fi
 
     elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-        ALL_PKGS="${ALL_PKGS} dovecot-imapd dovecot-pop3d"
+        ALL_PKGS="${ALL_PKGS} dovecot-imapd dovecot-pop3d dovecot-managesieved dovecot-sieve"
 
-        if [ X"${DISTRO_CODENAME}" != X'squeeze' ]; then
-            ALL_PKGS="${ALL_PKGS} dovecot-managesieved dovecot-sieve"
-
-            if [ X"${BACKEND}" == X"OPENLDAP" ]; then
-                ALL_PKGS="${ALL_PKGS} dovecot-ldap dovecot-mysql"
-            elif [ X"${BACKEND}" == X"MYSQL" ]; then
-                ALL_PKGS="${ALL_PKGS} dovecot-mysql"
-            elif [ X"${BACKEND}" == X"PGSQL" ]; then
-                ALL_PKGS="${ALL_PKGS} dovecot-pgsql"
-            fi
+        if [ X"${BACKEND}" == X"OPENLDAP" ]; then
+            ALL_PKGS="${ALL_PKGS} dovecot-ldap dovecot-mysql"
+        elif [ X"${BACKEND}" == X"MYSQL" ]; then
+            ALL_PKGS="${ALL_PKGS} dovecot-mysql"
+        elif [ X"${BACKEND}" == X"PGSQL" ]; then
+            ALL_PKGS="${ALL_PKGS} dovecot-pgsql"
         fi
     elif [ X"${DISTRO}" == X'GENTOO' ]; then
         ALL_PKGS="${ALL_PKGS} dovecot"

File iRedMail/pkgs/MD5.debian.squeeze

-2f1d6d4f900af59920378c0d2a5af695  misc/iRedAdmin-0.2.2.tar.bz2
-e60d5fc120517062ea388c47739742b3  misc/roundcubemail-0.9.2.tar.gz
-169d528bd4d19abcb05506566b9b4109  misc/iRedAPD-1.4.1.tar.bz2
-ad8f05cef0c443d9ce2940bf36319c24  misc/phpPgAdmin-5.1.tar.bz2

File iRedMail/pkgs/get_all.sh

 # Misc file (source tarball) list.
 if [ X"${DISTRO}" == X"FREEBSD" ]; then
     PKGMISC='SHASUM.freebsd.misc'
-elif [ X"${DISTRO}" == X"DEBIAN" -a X"${DISTRO_CODENAME}" == X"squeeze" ]; then
-    PKGMISC='MD5.debian.squeeze'
 elif [ X"${DISTRO}" == X"SUSE" ]; then
     PKGMISC='MD5.misc MD5.opensuse'
 elif [ X"${DISTRO}" == X'OPENBSD' ]; then

File iRedMail/samples/dovecot/dovecot2.conf

 # http://wiki2.dovecot.org/SSL/DovecotConfiguration
 ssl = required
 verbose_ssl = no
+#ssl_ca =</path/to/ca
 ssl_cert = <PH_SSL_CERT
 ssl_key = <PH_SSL_KEY
 

File iRedMail/samples/sa.local.cf

 # Local host (127.0.0.1) will automatically be trusted implicitly.
 #trusted_networks 192.168/16
 
-# Whitelist from SPF.
-#whitelist_from_spf     joe@example.com fred@example.com
-whitelist_from_spf      *@gmail.com
-whitelist_from_spf      *@126.com *@163.com
-whitelist_from_spf      *@sina.com *@sohu.com *@tom.com
-whitelist_from_spf      *@live.com *@hotmail.com
-
 # Whitelist from DKIM.
-whitelist_from_dkim       *@gmail.com *@paypal.com
+whitelist_from_dkim       *@paypal.com
 
 # Whitelist domains.
 # Reference: http://wiki.apache.org/spamassassin/ManualWhitelist