From fcd0efc26534e101a364b2bd61d0f5617fbe286f Mon Sep 17 00:00:00 2001
From: Tobias <tobiasbecker@TB-MBP-Dock.fritz.box>
Date: Sun, 3 Sep 2017 19:41:47 +0200
Subject: [PATCH] Change primary name of SSL certificate
Hostname as primary name for the SSL certificate, all other names will
be added as SAN
---
data/Dockerfiles/acme/docker-entrypoint.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/data/Dockerfiles/acme/docker-entrypoint.sh b/data/Dockerfiles/acme/docker-entrypoint.sh
index c6bf76ca..85fd70ce 100755
--- a/data/Dockerfiles/acme/docker-entrypoint.sh
+++ b/data/Dockerfiles/acme/docker-entrypoint.sh
@@ -126,6 +126,9 @@ while true; do
fi
for SAN in "${ADDITIONAL_SAN_ARR[@]}"; do
+ if [[ ${SAN} == ${MAILCOW_HOSTNAME} ]]; then
+ continue
+ fi
A_SAN=$(dig A ${SAN} +short | tail -n 1)
if [[ ! -z ${A_SAN} ]]; then
echo "Found A record for ${SAN}: ${A_SAN}"
@@ -141,7 +144,7 @@ while true; do
done
# Unique elements
- ALL_VALIDATED=($(echo ${VALIDATED_MAILCOW_HOSTNAME} ${VALIDATED_CONFIG_DOMAINS[*]} ${ADDITIONAL_VALIDATED_SAN[*]} | xargs -n1 | sort -u | xargs))
+ ALL_VALIDATED=(${VALIDATED_MAILCOW_HOSTNAME} $(echo ${VALIDATED_CONFIG_DOMAINS[*]} ${ADDITIONAL_VALIDATED_SAN[*]} | xargs -n1 | sort -u | xargs))
if [[ -z ${ALL_VALIDATED[*]} ]]; then
echo "Cannot validate hostnames, skipping Let's Encrypt..."
exit 0