Commits

Zhang Huangbin  committed 14cd934

Use 'smtp_tls_security_level=none' for 127.0.0.1:10025.

  • Participants
  • Parent commits 72b5cc9

Comments (0)

Files changed (2)

File iRedMail/functions/amavisd.sh

 
 ${AMAVISD_SERVER}:10025 inet n  -   -   -   -  smtpd
     -o content_filter=
+    -o mynetworks_style=host
+    -o mynetworks=${AMAVISD_MYNETWORKS}
     -o local_recipient_maps=
     -o relay_recipient_maps=
+    -o strict_rfc821_envelopes=yes
+    -o smtp_tls_security_level=none
+    -o smtpd_tls_security_level=none
     -o smtpd_restriction_classes=
     -o smtpd_delay_reject=no
-    -o smtpd_tls_security_level=none
     -o smtpd_client_restrictions=permit_mynetworks,reject
     -o smtpd_helo_restrictions=
     -o smtpd_sender_restrictions=
     -o smtpd_recipient_restrictions=permit_mynetworks,reject
     -o smtpd_end_of_data_restrictions=
-    -o mynetworks_style=host
-    -o mynetworks=${AMAVISD_MYNETWORKS}
-    -o strict_rfc821_envelopes=yes
     -o smtpd_error_sleep_time=0
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000

File iRedMail/functions/roundcubemail.sh

         # conf.d/roundcubemail.conf file after upgrade this component.
         ln -s ${RCM_HTTPD_ROOT} ${RCM_HTTPD_ROOT_SYMBOL_LINK} 2>/dev/null
 
-        # Patch for Roundcube 1.0.0:
-        # apply user-spefici replacements to group's base_dn property
-        cd ${RCM_HTTPD_ROOT}
-        patch -p1 < ${PATCH_DIR}/roundcubemail/ldap_group_base_dn_replacement.patch >/dev/null
-
         ECHO_DEBUG "Set correct permission for Roundcubemail: ${RCM_HTTPD_ROOT}."
         chown -R ${SYS_ROOT_USER}:${SYS_ROOT_GROUP} ${RCM_HTTPD_ROOT}
         chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${RCM_HTTPD_ROOT}/{temp,logs}