Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Postfix] Remove duplicate proxy read maps, add resource maps

Browse Source
This commit is contained in:
andryyy 2019-06-09 16:49:02 +02:00
parent 53bda04848
commit de3a89ac7a
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/conf/postfix/main.cf
View File

@ -40,16 +40,10 @@ postscreen_greet_ttl = 2d
postscreen_greet_wait = 3s postscreen_greet_wait = 3s
postscreen_non_smtp_command_enable = no postscreen_non_smtp_command_enable = no
postscreen_pipelining_enable = no postscreen_pipelining_enable = no
proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_sender_acl.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_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:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf, proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf,
proxy:mysql:/opt/postfix/conf/sql/mysql_sender_bcc_maps.cf, $sender_dependent_default_transport_maps,
proxy:mysql:/opt/postfix/conf/sql/mysql_recipient_bcc_maps.cf, $smtp_tls_policy_maps,
proxy:mysql:/opt/postfix/conf/sql/mysql_recipient_canonical_maps.cf,
$local_recipient_maps, $local_recipient_maps,
$mydestination, $mydestination,
$virtual_alias_maps, $virtual_alias_maps,
@ -60,11 +54,14 @@ proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_sender_acl.cf,
$relay_domains, $relay_domains,
$canonical_maps, $canonical_maps,
$sender_canonical_maps, $sender_canonical_maps,
$sender_bcc_maps,
$recipient_bcc_maps,
$recipient_canonical_maps, $recipient_canonical_maps,
$relocated_maps, $relocated_maps,
$transport_maps, $transport_maps,
$mynetworks, $mynetworks,
$smtpd_sender_login_maps $smtpd_sender_login_maps,
$smtp_sasl_password_maps
queue_run_delay = 300s queue_run_delay = 300s
relay_domains = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_relay_domain_maps.cf 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 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 tls_ssl_options = NO_COMPRESSION
smtpd_tls_mandatory_ciphers = high smtpd_tls_mandatory_ciphers = high
virtual_alias_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_maps.cf, 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_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_maps.cf,
proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_domain_catchall_maps.cf proxy:mysql:/opt/postfix/conf/sql/mysql_virtual_alias_domain_catchall_maps.cf

1
data/conf/rspamd/override.d/worker-controller-password.inc
View File

@ -1 +0,0 @@
# Placeholder