kishi/infra
1
0
Fork 0
forked from infra/ansible
Code Releases Activity

Fix certificate/CA handling.

Browse Source
This commit is contained in:
Markus 2016-04-06 18:00:23 +02:00
parent ad9f37a966
commit 8d7abb4f0c
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/certmgr/templates/acme.conf.j2
View File

@ -6,3 +6,4 @@ ttl_days: 30
authority: "https://acme-v01.api.letsencrypt.org" authority: "https://acme-v01.api.letsencrypt.org"
defaults: defaults:
cafile: /etc/acme/lets-encrypt-x3-cross-signed.pem

8
roles/mail/templates/certs.j2
View File

@ -6,22 +6,22 @@
group: postfix group: postfix
perm: '400' perm: '400'
format: crt format: crt
notify: 'service postfix reload' notify: 'service postfix restart'
- path: /etc/postfix/ssl/{{ mail_server }}.key - path: /etc/postfix/ssl/{{ mail_server }}.key
user: postfix user: postfix
group: postfix group: postfix
perm: '400' perm: '400'
format: key format: key
notify: 'service postfix reload' notify: 'service postfix restart'
- path: /etc/dovecot/ssl/{{ mail_server }}.crt - path: /etc/dovecot/ssl/{{ mail_server }}.crt
user: dovecot user: dovecot
group: dovecot group: dovecot
perm: '400' perm: '400'
format: crt format: crt
notify: 'service dovecot reload' notify: 'service dovecot restart'
- path: /etc/dovecot/ssl/{{ mail_server }}.key - path: /etc/dovecot/ssl/{{ mail_server }}.key
user: dovecot user: dovecot
group: dovecot group: dovecot
perm: '400' perm: '400'
format: key format: key
notify: 'service dovecot reload' notify: 'service dovecot restart'

2
roles/mail/templates/dovecot/local.conf.j2
View File

@ -18,7 +18,7 @@ mail_gid = vmail
ssl = yes ssl = yes
ssl_cert = </etc/dovecot/ssl/{{ mail_server }}.crt ssl_cert = </etc/dovecot/ssl/{{ mail_server }}.crt
ssl_key = </etc/dovecot/ssl/{{ mail_server }}.key ssl_key = </etc/dovecot/ssl/{{ mail_server }}.key
#ssl_ca = TODO ssl_ca = </etc/acme/lets-encrypt-x3-cross-signed.pem
ssl_protocols = !SSLv2 !SSLv3 ssl_protocols = !SSLv2 !SSLv3
ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA

6
roles/mail/templates/mailman/certs.j2
View File

@ -5,11 +5,11 @@
user: nginx user: nginx
group: nginx group: nginx
perm: '400' perm: '400'
format: crt format: crt,ca
notify: 'service nginx reload' notify: 'service nginx restart'
- path: /etc/nginx/ssl/{{ mailman_domain }}.key - path: /etc/nginx/ssl/{{ mailman_domain }}.key
user: nginx user: nginx
group: nginx group: nginx
perm: '400' perm: '400'
format: key format: key
notify: 'service nginx reload' notify: 'service nginx restart'

2
roles/mail/templates/postfix/main.cf.j2
View File

@ -32,7 +32,7 @@ smtp_tls_loglevel = 2
smtpd_tls_cert_file=/etc/postfix/ssl/{{ mail_server }}.crt smtpd_tls_cert_file=/etc/postfix/ssl/{{ mail_server }}.crt
smtpd_tls_key_file=/etc/postfix/ssl/{{ mail_server }}.key smtpd_tls_key_file=/etc/postfix/ssl/{{ mail_server }}.key
#smtpd_tls_CAfile=TODO smtpd_tls_CAfile=/etc/acme/lets-encrypt-x3-cross-signed.pem
smtpd_use_tls=yes smtpd_use_tls=yes
smtpd_tls_ciphers = medium smtpd_tls_ciphers = medium