YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Use SSL certificate of main domain in Dovecot and Postfix conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-04-25 23:01:46 +02:00
parent bfe9a12e1c
commit 564e2c6503
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/templates/dovecot/dovecot.conf
View file

@ -29,10 +29,11 @@ service auth {
protocol sieve { protocol sieve {
} }
ssl_ca = </etc/ssl/certs/ca-yunohost_crt.pem ssl_ca = </etc/yunohost/certs/{{ main_domain }}/ca.pem
ssl_cert = </etc/ssl/certs/yunohost_crt.pem ssl_cert = </etc/yunohost/certs/{{ main_domain }}/crt.pem
ssl_key = </etc/ssl/private/yunohost_key.pem ssl_key = </etc/yunohost/certs/{{ main_domain }}/key.pem
ssl_protocols = !SSLv2 !SSLv3 ssl_protocols = !SSLv2 !SSLv3
userdb { userdb {
args = /etc/dovecot/dovecot-ldap.conf args = /etc/dovecot/dovecot-ldap.conf
driver = ldap driver = ldap

6
data/templates/postfix/main.cf
View file

@ -28,9 +28,9 @@ smtpd_tls_security_level=may
# compatibility with non-TLS clients, the default is to accept AUTH without # compatibility with non-TLS clients, the default is to accept AUTH without
# encryption. In order to change this behavior, we set "smtpd_tls_auth_only = yes". # encryption. In order to change this behavior, we set "smtpd_tls_auth_only = yes".
smtpd_tls_auth_only=yes smtpd_tls_auth_only=yes
smtpd_tls_cert_file=/etc/ssl/certs/yunohost_crt.pem smtpd_tls_cert_file = /etc/yunohost/certs/{{ main_domain }}/crt.pem
smtpd_tls_key_file=/etc/ssl/private/yunohost_key.pem smtpd_tls_key_file = /etc/yunohost/certs/{{ main_domain }}/key.pem
smtpd_tls_CAfile = /etc/ssl/certs/ca-yunohost_crt.pem smtpd_tls_CAfile = /etc/yunohost/certs/{{ main_domain }}/ca.pem
smtpd_tls_exclude_ciphers = aNULL, MD5, DES, ADH, RC4, 3DES smtpd_tls_exclude_ciphers = aNULL, MD5, DES, ADH, RC4, 3DES
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
smtpd_tls_loglevel=1 smtpd_tls_loglevel=1