Commits

Zhang Huangbin committed 9c2d200

SPF verification is now enabled by default.

Comments (0)

Files changed (3)

iRedMail/ChangeLog

 iRedMail-0.7.4:
     * It now works on Ubuntu 11.10.
+    * SPF verification is now enabled by default.
     * Add Policyd-2.0.x (code name "cluebringer") support on Ubuntu 11.10.
     * LDA (Dovecot deliver) will move SPAM to Junk folder by default.
     * Add missing INDEXes for Amavisd database: msgs.mail_id, (msgs.content,

iRedMail/dialog/optional_components.sh

     --checklist "\
 Note:
     * DKIM is recommended.
+    * SPF validation (Sender Policy Framework) is enabled by default.
     * DNS records (TXT type) are required for both SPF and DKIM.
     * Refer to file for more detail after installation:
       ${TIP_FILE}
 " 20 76 8 \
-    "SPF Validation" "Sender Policy Framework" "on" \
     "DKIM signing/verification" "DomainKeys Identified Mail" "on" \
     "iRedAdmin" "Official web-based Admin Panel" "on" \
     "Roundcubemail" "WebMail program (PHP, AJAX)" "on" \
     --checklist "\
 Note:
     * DKIM is recommended.
+    * SPF validation (Sender Policy Framework) is enabled by default.
     * DNS record (TXT type) are required for both SPF and DKIM.
     * Please refer to file for more detail after installation:
       ${TIP_FILE}
 " 20 76 8 \
-    "SPF Validation" "Sender Policy Framework" "on" \
     "DKIM signing/verification" "DomainKeys Identified Mail" "on" \
     "Roundcubemail" "WebMail program (PHP, AJAX)" "on" \
     "phpMyAdmin" "Web-based MySQL management tool" "on" \

iRedMail/functions/packages.sh

         :
     fi
 
-    # SPF.
-    if [ X"${ENABLE_SPF}" == X"YES" ]; then
-        if [ X"${DISTRO}" == X"RHEL" ]; then
-            # SPF implemention via perl-Mail-SPF.
-            ALL_PKGS="${ALL_PKGS} perl-Mail-SPF.noarch perl-Mail-SPF-Query.noarch"
+    # SPF verification.
+    if [ X"${DISTRO}" == X"RHEL" ]; then
+        # SPF implemention via perl-Mail-SPF.
+        ALL_PKGS="${ALL_PKGS} perl-Mail-SPF.noarch perl-Mail-SPF-Query.noarch"
 
-        elif [ X"${DISTRO}" == X"SUSE" ]; then
-            # SPF implemention via perl-Mail-SPF.
-            ALL_PKGS="${ALL_PKGS} perl-Mail-SPF"
+    elif [ X"${DISTRO}" == X"SUSE" ]; then
+        # SPF implemention via perl-Mail-SPF.
+        ALL_PKGS="${ALL_PKGS} perl-Mail-SPF"
 
-        elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-            ALL_PKGS="${ALL_PKGS} libmail-spf-perl"
-        else
-            :
-        fi
-    else
-        :
+    elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
+        ALL_PKGS="${ALL_PKGS} libmail-spf-perl"
     fi