From 1f9b5cb16e88a31981a3548dc66f4807126a8acf Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Thu, 22 Jun 2017 20:34:54 +0200 Subject: [PATCH] ACME: support CNAME in domain checks --- data/Dockerfiles/acme/docker-entrypoint.sh | 6 +++--- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/Dockerfiles/acme/docker-entrypoint.sh b/data/Dockerfiles/acme/docker-entrypoint.sh index a02e2d57..d35f3c63 100755 --- a/data/Dockerfiles/acme/docker-entrypoint.sh +++ b/data/Dockerfiles/acme/docker-entrypoint.sh @@ -53,7 +53,7 @@ while true; do done < <(mysql -h mysql-mailcow -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain FROM domain" -Bs) for SQL_DOMAIN in "${SQL_DOMAIN_ARR[@]}"; do - A_CONFIG=$(dig A autoconfig.${SQL_DOMAIN} +short) + A_CONFIG=$(dig A autoconfig.${SQL_DOMAIN} +short | tail -n 1) if [[ ! -z ${A_CONFIG} ]]; then echo "Found A record for autoconfig.${SQL_DOMAIN}: ${A_CONFIG}" if [[ ${IPV4} == ${A_CONFIG} ]]; then @@ -66,7 +66,7 @@ while true; do echo "No A record for autoconfig.${SQL_DOMAIN} found" fi - A_DISCOVER=$(dig A autodiscover.${SQL_DOMAIN} +short) + A_DISCOVER=$(dig A autodiscover.${SQL_DOMAIN} +short | tail -n 1) if [[ ! -z ${A_DISCOVER} ]]; then echo "Found A record for autodiscover.${SQL_DOMAIN}: ${A_CONFIG}" if [[ ${IPV4} == ${A_DISCOVER} ]]; then @@ -81,7 +81,7 @@ while true; do done for SAN in "${ADDITIONAL_SAN_ARR[@]}"; do - A_SAN=$(dig A ${SAN} +short) + A_SAN=$(dig A ${SAN} +short | tail -n 1) if [[ ! -z ${A_SAN} ]]; then echo "Found A record for ${SAN}: ${A_SAN}" if [[ ${IPV4} == ${A_SAN} ]]; then diff --git a/docker-compose.yml b/docker-compose.yml index 900c1dda..ade39b40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -284,7 +284,7 @@ services: acme-mailcow: depends_on: - nginx-mailcow - image: mailcow/acme:1.1 + image: mailcow/acme:1.2 build: ./data/Dockerfiles/acme dns: - 172.22.1.254