From 73a566b25a9d4383e3c08e3eadc79221432a3163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Fri, 29 Jun 2018 09:35:48 +0200
Subject: [PATCH] [ACME] Fix for multiple additional SAN
---
data/Dockerfiles/acme/docker-entrypoint.sh | 4 ++--
docker-compose.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/Dockerfiles/acme/docker-entrypoint.sh b/data/Dockerfiles/acme/docker-entrypoint.sh
index 5aa89d75..727858c9 100755
--- a/data/Dockerfiles/acme/docker-entrypoint.sh
+++ b/data/Dockerfiles/acme/docker-entrypoint.sh
@@ -263,7 +263,7 @@ while true; do
log_f "Found AAAA record for ${SAN}: ${AAAA_SAN} - skipping A record check"
if [[ $(expand ${IPV6:-"0000:0000:0000:0000:0000:0000:0000:0000"}) == $(expand ${AAAA_SAN}) ]] || [[ ${SKIP_IP_CHECK} == "y" ]]; then
log_f "Confirmed AAAA record ${SAN}"
- ADDITIONAL_VALIDATED_SAN=${SAN}
+ ADDITIONAL_VALIDATED_SAN+=("${SAN}")
else
log_f "Cannot match your IP ${IPV6:-NO_IPV6_LINK} against hostname ${SAN} ($(expand ${AAAA_SAN}))"
fi
@@ -271,7 +271,7 @@ while true; do
log_f "Found A record for ${SAN}: ${A_SAN}"
if [[ ${IPV4:-ERR} == ${A_SAN} ]] || [[ ${SKIP_IP_CHECK} == "y" ]]; then
log_f "Confirmed A record ${A_SAN}"
- ADDITIONAL_VALIDATED_SAN=${SAN}
+ ADDITIONAL_VALIDATED_SAN+=("${SAN}")
else
log_f "Cannot match your IP ${IPV4} against hostname ${SAN} (${A_SAN})"
fi
diff --git a/docker-compose.yml b/docker-compose.yml
index 0453e622..ccab2f85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -298,7 +298,7 @@ services:
depends_on:
- nginx-mailcow
- mysql-mailcow
- image: mailcow/acme:1.33
+ image: mailcow/acme:1.34
build: ./data/Dockerfiles/acme
sysctls:
- net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}