Просмотр исходного кода

[ACME] Be more verbose about IP address

andryyy 8 лет назад
Родитель
Сommit
d2048ccf20
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      data/Dockerfiles/acme/docker-entrypoint.sh
  2. 1 1
      docker-compose.yml

+ 3 - 3
data/Dockerfiles/acme/docker-entrypoint.sh

@@ -79,7 +79,7 @@ while true; do
 				echo "Confirmed A record autoconfig.${SQL_DOMAIN}"
 				VALIDATED_CONFIG_DOMAINS+=("autoconfig.${SQL_DOMAIN}")
 			else
-				echo "Cannot match your IP against hostname autoconfig.${SQL_DOMAIN}"
+				echo "Cannot match your IP ${IPV4} against hostname autoconfig.${SQL_DOMAIN} (${A_CONFIG})"
 			fi
 		else
 			echo "No A record for autoconfig.${SQL_DOMAIN} found"
@@ -92,7 +92,7 @@ while true; do
 				echo "Confirmed A record autodiscover.${SQL_DOMAIN}"
 				VALIDATED_CONFIG_DOMAINS+=("autodiscover.${SQL_DOMAIN}")
 			else
-				echo "Cannot match your IP against hostname autodiscover.${SQL_DOMAIN}"
+				echo "Cannot match your IP ${IPV4} against hostname autodiscover.${SQL_DOMAIN} (${A_DISCOVER})"
 			fi
 		else
 			echo "No A record for autodiscover.${SQL_DOMAIN} found"
@@ -106,7 +106,7 @@ while true; do
 			echo "Confirmed A record ${MAILCOW_HOSTNAME}"
 			VALIDATED_MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
 		else
-			echo "Cannot match your IP against hostname ${MAILCOW_HOSTNAME}"
+			echo "Cannot match your IP ${IPV4} against hostname ${MAILCOW_HOSTNAME} (${A_MAILCOW_HOSTNAME}) "
 		fi
 	else
 		echo "No A record for ${MAILCOW_HOSTNAME} found"

+ 1 - 1
docker-compose.yml

@@ -293,7 +293,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.7
+      image: mailcow/acme:1.8
       build: ./data/Dockerfiles/acme
       dns:
         - 172.22.1.254