From b7e9221ffa192e4f3260b9677b205f2e14616814 Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Sat, 5 Dec 2015 19:08:39 +0100 Subject: [PATCH] Fixed error reported by jderusse --- bin/generate-ssl-certificate | 2 +- start-mailserver.sh | 2 +- test/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/generate-ssl-certificate b/bin/generate-ssl-certificate index 682b07d4..aee67906 100644 --- a/bin/generate-ssl-certificate +++ b/bin/generate-ssl-certificate @@ -10,5 +10,5 @@ openssl req -new -nodes -keyout /ssl/$FQDN-key.pem -out /ssl/$FQDN-req.pem -days # Sign the public key certificate with CA certificate openssl ca -out /ssl/$FQDN-cert.pem -infiles /ssl/$FQDN-req.pem # Combine certificates for courier -cat /ssl/$FQDN-key.pem /ssl/$FQDN-cert.pem >> /ssl/$FQDN-combined.pem +cat /ssl/$FQDN-key.pem /ssl/$FQDN-cert.pem > /ssl/$FQDN-combined.pem diff --git a/start-mailserver.sh b/start-mailserver.sh index 72345629..ce82eb33 100644 --- a/start-mailserver.sh +++ b/start-mailserver.sh @@ -64,7 +64,7 @@ case $DMS_SSL in 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 - cat /etc/letsencrypt/live/$(hostname)/privkey.pem /etc/letsencrypt/live/$(hostname)/cert.pem >> /etc/letsencrypt/live/$(hostname)/combined.pem + cat /etc/letsencrypt/live/$(hostname)/privkey.pem /etc/letsencrypt/live/$(hostname)/cert.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 echo "SSL configured with letsencrypt certificates" diff --git a/test/test.sh b/test/test.sh index 8eeed27b..43bce4f1 100644 --- a/test/test.sh +++ b/test/test.sh @@ -38,7 +38,7 @@ assert_raises "docker exec mail grep -- '-> ' /var/lo # Testing that a SPAM is rejected assert_raises "docker exec mail grep 'Blocked SPAM' /var/log/mail.log | grep spam@external.tld" -# TODO: Testing that a Virus is rejected +# Testing that a Virus is rejected assert_raises "docker exec mail grep 'Blocked INFECTED' /var/log/mail.log | grep virus@external.tld" # Testing presence of freshclam CRON