From dbc6c6dffa166c049e99c881a11b60e10b08b2b5 Mon Sep 17 00:00:00 2001
From: Jack Twilley <mathuin@users.noreply.github.com>
Date: Tue, 30 Aug 2016 00:57:44 -0700
Subject: [PATCH] Actually use the key. (#290)

This code was mistakenly not committed, and is required for the feature to work.
---
 target/start-mailserver.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index e96422b8..3745e973 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -124,20 +124,20 @@ case $SSL_TYPE in
     && [ -e "/etc/letsencrypt/live/$(hostname)/fullchain.pem" ]; then
       KEY=""
       if [ -e "/etc/letsencrypt/live/$(hostname)/privkey.pem" ]; then
-        KEY="/etc/letsencrypt/live/$(hostname)/privkey.pem"
+        KEY="privkey"
       elif [ -e "/etc/letsencrypt/live/$(hostname)/key.pem" ]; then
-        KEY="/etc/letsencrypt/live/$(hostname)/key.pem"
+        KEY="key"
       fi
       if [ -n "$KEY" ]; then
         echo "Adding $(hostname) SSL certificate"
 
         # 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_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)'\/'"$KEY"'\.pem/g' /etc/postfix/main.cf
 
         # Dovecot configuration
         sed -i -e 's/ssl_cert = <\/etc\/dovecot\/dovecot\.pem/ssl_cert = <\/etc\/letsencrypt\/live\/'$(hostname)'\/fullchain\.pem/g' /etc/dovecot/conf.d/10-ssl.conf
-        sed -i -e 's/ssl_key = <\/etc\/dovecot\/private\/dovecot\.pem/ssl_key = <\/etc\/letsencrypt\/live\/'$(hostname)'\/privkey\.pem/g' /etc/dovecot/conf.d/10-ssl.conf
+        sed -i -e 's/ssl_key = <\/etc\/dovecot\/private\/dovecot\.pem/ssl_key = <\/etc\/letsencrypt\/live\/'$(hostname)'\/'"$KEY"'\.pem/g' /etc/dovecot/conf.d/10-ssl.conf
 
         echo "SSL configured with 'letsencrypt' certificates"