Fixed error reported by jderusse

Author: tomav

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
 

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"

test/test.sh

@@ -38,7 +38,7 @@ assert_raises "docker exec mail grep -- '-> <[email protected]>' /var/lo
 # Testing that a SPAM is rejected
 assert_raises "docker exec mail grep 'Blocked SPAM' /var/log/mail.log | grep [email protected]"
 
-# 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 [email protected]"
 
 # Testing presence of freshclam CRON