docker/docker-mailserver
1
0
Fork 0
mirror of https://github.com/tomav/docker-mailserver.git synced 2024-06-26 00:59:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #118 from Reldeis/master

Browse Source 
check .pem existence and concat to combined.pem with added eol
This commit is contained in:
Thomas VIAL 2016-04-08 15:41:46 +02:00
commit ae5052f210
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
start-mailserver.sh
View File

@ -120,17 +120,18 @@ fi
case $DMS_SSL in case $DMS_SSL in
"letsencrypt" ) "letsencrypt" )
# letsencrypt folders and files mounted in /etc/letsencrypt # letsencrypt folders and files mounted in /etc/letsencrypt
# add eol to all files before concatenation if [ -e "/etc/letsencrypt/live/$(hostname)/cert.pem" ] \
sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/cert.pem && [ -e "/etc/letsencrypt/live/$(hostname)/chain.pem" ] \
sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/chain.pem && [ -e "/etc/letsencrypt/live/$(hostname)/privkey.pem" ]; then
sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/privkey.pem echo "Adding $(hostname) SSL certificate"
# create combined.pem from (cert|chain|privkey).pem with eol after each .pem
sed -e '$a\' -s "/etc/letsencrypt/live/$(hostname)/{cert,chain,privkey}.pem" > "/etc/letsencrypt/live/$(hostname)/combined.pem"
# Postfix configuration # Postfix configuration
sed -i -r 's/smtpd_tls_cert_file=\/etc\/ssl\/certs\/ssl-cert-snakeoil.pem/smtpd_tls_cert_file=\/etc\/letsencrypt\/live\/'$(hostname)'\/fullchain.pem/g' /etc/postfix/main.cf sed -i -r 's/smtpd_tls_cert_file=\/etc\/ssl\/certs\/ssl-cert-snakeoil.pem/smtpd_tls_cert_file=\/etc\/letsencrypt\/live\/'$(hostname)'\/fullchain.pem/g' /etc/postfix/main.cf
sed -i -r 's/smtpd_tls_key_file=\/etc\/ssl\/private\/ssl-cert-snakeoil.key/smtpd_tls_key_file=\/etc\/letsencrypt\/live\/'$(hostname)'\/privkey.pem/g' /etc/postfix/main.cf sed -i -r 's/smtpd_tls_key_file=\/etc\/ssl\/private\/ssl-cert-snakeoil.key/smtpd_tls_key_file=\/etc\/letsencrypt\/live\/'$(hostname)'\/privkey.pem/g' /etc/postfix/main.cf
# Courier configuration # Courier configuration
cat "/etc/letsencrypt/live/$(hostname)/cert.pem" "/etc/letsencrypt/live/$(hostname)/chain.pem" "/etc/letsencrypt/live/$(hostname)/privkey.pem" > "/etc/letsencrypt/live/$(hostname)/combined.pem"
sed -i -r 's/TLS_CERTFILE=\/etc\/courier\/imapd.pem/TLS_CERTFILE=\/etc\/letsencrypt\/live\/'$(hostname)'\/combined.pem/g' /etc/courier/imapd-ssl sed -i -r 's/TLS_CERTFILE=\/etc\/courier\/imapd.pem/TLS_CERTFILE=\/etc\/letsencrypt\/live\/'$(hostname)'\/combined.pem/g' /etc/courier/imapd-ssl
# POP3 courier configuration # POP3 courier configuration
@ -141,6 +142,7 @@ case $DMS_SSL in
echo "SSL configured with letsencrypt certificates" echo "SSL configured with letsencrypt certificates"
fi
;; ;;
"custom" ) "custom" )