Zhang Huangbin avatar Zhang Huangbin committed 90d69c8

Disable per-user ldap address book by default.
Add new mail domain in cluebringer policy group: internal_domains.

Comments (0)

Files changed (3)

iRedMail/functions/cluebringer.sh

 INSERT INTO checkhelo (id, policyid, name, useblacklist, blacklistperiod, usehrp, hrpperiod, hrplimit, rejectinvalid, rejectip, rejectunresolvable, comment, disabled) VALUES (1, 3, 'Enable HELO/EHLO check', 1, 2419200, 1, 2419200, 5, 1, 1, 0, 'Enable HELO/EHLO check on inbound by default', 0);
 EOF
 
+    # Add first mail domain to policy group: internal_domains
+    cat >> ${tmp_sql} <<EOF
+INSERT INTO policy_group_members (PolicyGroupID, Member, Disabled) VALUES (2, '@${FIRST_DOMAIN}', 0);
+EOF
+
     # Initial cluebringer db.
     # Enable greylisting on all inbound emails by default.
     if [ X"${BACKEND}" == X"OPENLDAP" -o X"${BACKEND}" == X"MYSQL" ]; then

iRedMail/functions/postfix.sh

     postconf -e smtpd_reject_unlisted_recipient='yes'   # Default
     postconf -e smtpd_sender_restrictions="permit_mynetworks, reject_sender_login_mismatch, permit_sasl_authenticated"
     postconf -e delay_warning_time='0h'
-    postconf -e policy_time_limit='3600'
     postconf -e maximal_queue_lifetime='1d'
     postconf -e bounce_queue_lifetime='1d'
     postconf -e recipient_delimiter='+'
     postconf -e smtpd_tls_cert_file="${SSL_CERT_FILE}"
     postconf -e smtpd_tls_CAfile="${SSL_CERT_FILE}"
     postconf -e tls_random_source='dev:/dev/urandom'
-    postconf -e tls_daemon_random_source='dev:/dev/urandom'
 
     if [ X"${DISTRO}" == X"SUSE" ]; then
         perl -pi -e 's#^(POSTFIX_SMTP_TLS_SERVER=).*#${1}"yes"#' ${POSTFIX_SYSCONFIG_CONF}

iRedMail/functions/roundcubemail.sh

     'fuzzy_search'  => true);
 
 // Personal LDAP address book.
+/*
 \$rcmail_config['ldap_public']["ldap_personal"] = array(
     'name'          => 'Personal LDAP Address Book',
     'hosts'         => array('${LDAP_SERVER_HOST}'),
     'filter'        => '(objectClass=inetOrgPerson)',
     'fuzzy_search'  => true);
 
+*/
 // end of config file
 ?>
 EOF
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.