Merge branch 'master' of ssh://github.com/jsha/starttls-everywhere

This commit is contained in:
Peter Eckersley 2014-06-11 09:13:01 -07:00
commit d7e4d93190
3 changed files with 4 additions and 3 deletions

View file

@ -1 +1 @@
#valid-example-recipient.com encrypt protocols=TLSv1.1
valid-example-recipient.com secure match=valid-example-recipient.com:.valid-example-recipient.com

View file

@ -43,3 +43,4 @@ smtp_tls_policy_maps = texthash:/etc/postfix/tls_policy
smtp_tls_loglevel = 1
smtp_tls_security_level = may
smtp_tls_CAfile = /etc/certificates/ca.crt

View file

@ -18,8 +18,6 @@ append_dot_mydomain = no
readme_directory = no
# TLS parameters
smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
smtpd_use_tls=yes
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
@ -44,3 +42,5 @@ smtpd_tls_received_header = yes
#STARTTLS EVERYWHERE MAGIC STARTS HERE
smtp_tls_policy_maps = texthash:/etc/postfix/tls_policy
smtpd_tls_cert_file=/etc/certificates/valid.crt
smtpd_tls_key_file=/etc/certificates/valid.key