From de3a89ac7a9e32c51866a9e8273045be9a00be84 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 9 Jun 2019 16:49:02 +0200 Subject: [PATCH] [Postfix] Remove duplicate proxy read maps, add resource maps --- data/conf/postfix/main.cf | 18 ++++++++---------- .../override.d/worker-controller-password.inc | 1 - 2 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 data/conf/rspamd/override.d/worker-controller-password.inc diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index b0fda8bb..13872751 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -40,16 +40,10 @@ postscreen_greet_ttl = 2d postscreen_greet_wait = 3s postscreen_non_smtp_command_enable = no postscreen_pipelining_enable = no -proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_sender_acl.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_sender_dependent_default_transport_maps.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_transport_maps.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_sender_dependent.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf, +proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_sender_bcc_maps.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_recipient_bcc_maps.cf, - proxy:mysql:/opt/postfix/conf/sql/mysql_recipient_canonical_maps.cf, + $sender_dependent_default_transport_maps, + $smtp_tls_policy_maps, $local_recipient_maps, $mydestination, $virtual_alias_maps, @@ -60,11 +54,14 @@ proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_sender_acl.cf, $relay_domains, $canonical_maps, $sender_canonical_maps, + $sender_bcc_maps, + $recipient_bcc_maps, $recipient_canonical_maps, $relocated_maps, $transport_maps, $mynetworks, - $smtpd_sender_login_maps + $smtpd_sender_login_maps, + $smtp_sasl_password_maps queue_run_delay = 300s relay_domains = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_relay_domain_maps.cf relay_recipient_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_relay_recipient_maps.cf @@ -109,6 +106,7 @@ tls_preempt_cipherlist = yes tls_ssl_options = NO_COMPRESSION smtpd_tls_mandatory_ciphers = high virtual_alias_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_maps.cf, + proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_resource_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_spamalias_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_domain_maps.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_domain_catchall_maps.cf diff --git a/data/conf/rspamd/override.d/worker-controller-password.inc b/data/conf/rspamd/override.d/worker-controller-password.inc deleted file mode 100644 index 9a5984d1..00000000 --- a/data/conf/rspamd/override.d/worker-controller-password.inc +++ /dev/null @@ -1 +0,0 @@ -# Placeholder