diff --git a/data/Dockerfiles/acme/functions.sh b/data/Dockerfiles/acme/functions.sh index 1dd35cb4..65405a60 100644 --- a/data/Dockerfiles/acme/functions.sh +++ b/data/Dockerfiles/acme/functions.sh @@ -66,7 +66,7 @@ check_domain(){ fi if [[ ! -z ${AAAA_DOMAIN} ]]; then log_f "Found AAAA record for ${DOMAIN}: ${AAAA_DOMAIN} - skipping A record check" - if [[ $(expand ${IPV6:-"0000:0000:0000:0000:0000:0000:0000:0000"}) == $(expand ${AAAA_DOMAIN}) ]] || [[ ${SKIP_IP_CHECK} == "y" ]]; then + if [[ $(expand ${IPV6:-"0000:0000:0000:0000:0000:0000:0000:0000"}) == $(expand ${AAAA_DOMAIN}) ]] || [[ ${SKIP_IP_CHECK} == "y" ]] || [[ ${SNAT6_TO_SOURCE} != "n" ]]; then if verify_challenge_path "${DOMAIN}" 6; then log_f "Confirmed AAAA record with IP ${AAAA_DOMAIN}" return 0 @@ -78,7 +78,7 @@ check_domain(){ fi elif [[ ! -z ${A_DOMAIN} ]]; then log_f "Found A record for ${DOMAIN}: ${A_DOMAIN}" - if [[ ${IPV4:-ERR} == ${A_DOMAIN} ]] || [[ ${SKIP_IP_CHECK} == "y" ]]; then + if [[ ${IPV4:-ERR} == ${A_DOMAIN} ]] || [[ ${SKIP_IP_CHECK} == "y" ]] || [[ ${SNAT_TO_SOURCE} != "n" ]]; then if verify_challenge_path "${DOMAIN}" 4; then log_f "Confirmed A record ${A_DOMAIN}" return 0 diff --git a/docker-compose.yml b/docker-compose.yml index 1fd96e54..a0eff44c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -152,7 +152,7 @@ services: - phpfpm sogo-mailcow: - image: mailcow/sogo:1.72 + image: mailcow/sogo:1.73 environment: - DBNAME=${DBNAME} - DBUSER=${DBUSER} @@ -333,7 +333,7 @@ services: acme-mailcow: depends_on: - nginx-mailcow - image: mailcow/acme:1.69 + image: mailcow/acme:1.70 dns: - ${IPV4_NETWORK:-172.22.1}.254 environment: @@ -352,6 +352,8 @@ services: - TZ=${TZ} - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-} - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-} + - SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n} + - SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n} volumes: - ./data/web/.well-known/acme-challenge:/var/www/acme:rw - ./data/assets/ssl:/var/lib/acme/:rw