Commits

Zhang Huangbin committed ba05323

Add '-o smtpd_tls_security_level=none' for Amavisd transport: 127.0.0.1:10025.
Code cleanup.

Comments (0)

Files changed (3)

iRedMail/functions/amavisd.sh

     -o relay_recipient_maps=
     -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=

iRedMail/functions/postfix.sh

         ${ldap_virtual_mailbox_maps_cf} \
         ${ldap_virtual_alias_maps_cf} \
         ${ldap_virtual_group_maps_cf} \
+        ${ldap_virtual_group_members_maps_cf} \
         ${ldap_recipient_bcc_maps_domain_cf} \
         ${ldap_recipient_bcc_maps_user_cf} \
         ${ldap_sender_bcc_maps_domain_cf} \

iRedMail/functions/roundcubemail.sh

     # ----------------------------------
     # IMAP
     # ----------------------------------
-    perl -pi -e 's#(.*default_host.*=).*#${1} "$ENV{'IMAP_SERVER'}";#' main.inc.php
+    export IMAP_SERVER
+    perl -pi -e 's#(.*default_host.*=).*#${1} "$ENV{IMAP_SERVER}";#' main.inc.php
     #perl -pi -e 's#(.*default_port.*=).*#${1} 143;#' main.inc.php
-    perl -pi -e 's#(.*imap_auth_type.*=).*#${1} "";#' main.inc.php
+    perl -pi -e 's#(.*imap_auth_type.*=).*#${1} "LOGIN";#' main.inc.php
 
     # IMAP share folder.
     perl -pi -e 's#(.*imap_delimiter.*=).*#${1} "/";#' main.inc.php
     # ----------------------------------
     # SMTP
     # ----------------------------------
-    perl -pi -e 's#(.*smtp_server.*= )(.*)#${1}"$ENV{'SMTP_SERVER'}";#' main.inc.php
+    export SMTP_SERVER
+    perl -pi -e 's#(.*smtp_server.*= )(.*)#${1}"$ENV{SMTP_SERVER}";#' main.inc.php
     #perl -pi -e 's#(.*smtp_port.*= )(.*)#${1} 25;#' main.inc.php
     perl -pi -e 's#(.*smtp_user.*= )(.*)#${1}"%u";#' main.inc.php
     perl -pi -e 's#(.*smtp_pass.*= )(.*)#${1}"%p";#' main.inc.php
 
     # smtp_auth_type: empty to use best server supported one)
-    perl -pi -e 's#(.*smtp_auth_type.*= )(.*)#${1}"";#' main.inc.php
+    perl -pi -e 's#(.*smtp_auth_type.*= )(.*)#${1}"LOGIN";#' main.inc.php
 
     # ----------------------------------
     # SYSTEM
     # Automatically create a new ROUNDCUBE USER when log-in the first time.
     perl -pi -e 's#(.*auto_create_user.*=)(.*)#${1} true;#' main.inc.php
 
-    perl -pi -e 's#(.*des_key.*= )(.*)#${1}"$ENV{'RCM_DES_KEY'}";#' main.inc.php
+    export RCM_DES_KEY
+    perl -pi -e 's#(.*des_key.*= )(.*)#${1}"$ENV{RCM_DES_KEY}";#' main.inc.php
 
     # Set useragent, hide version number.
     perl -pi -e 's#(.*useragent.*=).*#${1} "RoundCube WebMail";#' main.inc.php
         # Address template.
         # LDAP object class 'inetOrgPerson' doesn't contains country and region.
         perl -pi -e 's#(.*address_template.*=)(.*)#${1} "{street}<br/>{locality} {zipcode}";#' main.inc.php
-
-    #elif [ X"${BACKEND}" == X"MYSQL" ]; then
-        # Set correct username, password and database name.
-    #    perl -pi -e 's#(.*db_dsnw.*= )(.*)#${1}"$ENV{'PHP_CONN_TYPE'}://$ENV{'RCM_DB_USER'}:$ENV{'RCM_DB_PASSWD'}\@$ENV{'MYSQL_SERVER'}/$ENV{'VMAIL_DB'}";#' plugins/changepasswd/config.inc.php
-    else
-        :
     fi
 
     # Attachment size.