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

Fix inconsistent spacing in dovecot/dovecot.conf and postfix/main.cf (#3511) 

* Fix inconsistent spacing in dovecot.conf

* Fix inconsistent spacing in main.cf
master
Aaron 2020-04-30 18:22:21 +02:00 committed by GitHub
parent 33a775f066
commit 1f00887f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/conf/dovecot/dovecot.conf
View File

@ -37,7 +37,7 @@ ssl_cipher_list = ALL:!ADH:!LOW:!SSLv2:!SSLv3:!EXP:!aNULL:!eNULL:!3DES:!MD5:!PSK
ssl_options = no_compression no_ticket ssl_options = no_compression no_ticket
# New in Dovecot 2.3 # New in Dovecot 2.3
ssl_dh=</etc/ssl/mail/dhparams.pem ssl_dh = </etc/ssl/mail/dhparams.pem
# Dovecot 2.2 # Dovecot 2.2
#ssl_dh_parameters_length = 2048 #ssl_dh_parameters_length = 2048
log_timestamp = "%Y-%m-%d %H:%M:%S " log_timestamp = "%Y-%m-%d %H:%M:%S "
@ -361,7 +361,7 @@ plugin {
acl_anyone = </etc/dovecot/acl_anyone acl_anyone = </etc/dovecot/acl_anyone
acl_shared_dict = file:/var/vmail/shared-mailboxes.db acl_shared_dict = file:/var/vmail/shared-mailboxes.db
acl = vfile acl = vfile
last_login_dict=</etc/dovecot/last_login last_login_dict = </etc/dovecot/last_login
last_login_key = last-login/%s/%u last_login_key = last-login/%s/%u
fts = solr fts = solr
fts_autoindex = yes fts_autoindex = yes

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

@ -6,7 +6,7 @@ append_dot_mydomain = no
smtpd_tls_cert_file = /etc/ssl/mail/cert.pem smtpd_tls_cert_file = /etc/ssl/mail/cert.pem
smtpd_tls_key_file = /etc/ssl/mail/key.pem smtpd_tls_key_file = /etc/ssl/mail/key.pem
tls_server_sni_maps = hash:/opt/postfix/conf/sni.map tls_server_sni_maps = hash:/opt/postfix/conf/sni.map
smtpd_use_tls=yes smtpd_use_tls = yes
smtpd_tls_received_header = yes smtpd_tls_received_header = yes
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
@ -179,7 +179,7 @@ smtp_sasl_auth_enable = yes
smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_sender_dependent.cf smtp_sasl_password_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_sender_dependent.cf
smtp_sasl_security_options = smtp_sasl_security_options =
smtp_sasl_mechanism_filter = plain, login smtp_sasl_mechanism_filter = plain, login
smtp_tls_policy_maps=proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf smtp_tls_policy_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_tls_policy_override_maps.cf
smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre smtp_header_checks = pcre:/opt/postfix/conf/anonymize_headers.pcre
mail_name = Postcow mail_name = Postcow
# local_transport map catches local destinations and prevents routing local dests when the next map would route "*" # local_transport map catches local destinations and prevents routing local dests when the next map would route "*"