From 8dbc466bb98a8fb45a556b970192ada89c1d4373 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 1 Mar 2021 10:41:28 +0100 Subject: [PATCH] [Web] Add nevondo.com ip check source, thank you! --- data/Dockerfiles/acme/functions.sh | 3 ++- data/Dockerfiles/watchdog/watchdog.sh | 1 + docker-compose.yml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/Dockerfiles/acme/functions.sh b/data/Dockerfiles/acme/functions.sh index ec6d58f4..98d86dc6 100644 --- a/data/Dockerfiles/acme/functions.sh +++ b/data/Dockerfiles/acme/functions.sh @@ -33,7 +33,7 @@ get_ipv4(){ local IPV4_SRCS= local TRY= IPV4_SRCS[0]="ip4.mailcow.email" - IPV4_SRCS[1]="ip4.korves.net" + IPV4_SRCS[1]="ip4.nevondo.com" until [[ ! -z ${IPV4} ]] || [[ ${TRY} -ge 10 ]]; do IPV4=$(curl --connect-timeout 3 -m 10 -L4s ${IPV4_SRCS[$RANDOM % ${#IPV4_SRCS[@]} ]} | grep -E "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$") [[ ! -z ${TRY} ]] && sleep 1 @@ -47,6 +47,7 @@ get_ipv6(){ local IPV6_SRCS= local TRY= IPV6_SRCS[0]="ip6.mailcow.email" + IPV6_SRCS[1]="ip6.nevondo.com" until [[ ! -z ${IPV6} ]] || [[ ${TRY} -ge 10 ]]; do IPV6=$(curl --connect-timeout 3 -m 10 -L6s ${IPV6_SRCS[$RANDOM % ${#IPV6_SRCS[@]} ]} | grep "^\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}$") [[ ! -z ${TRY} ]] && sleep 1 diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh index aab0ce8b..8131421f 100755 --- a/data/Dockerfiles/watchdog/watchdog.sh +++ b/data/Dockerfiles/watchdog/watchdog.sh @@ -45,6 +45,7 @@ get_ipv6(){ local IPV6_SRCS= local TRY= IPV6_SRCS[0]="ip6.mailcow.email" + IPV6_SRCS[0]="ip6.nevondo.com" until [[ ! -z ${IPV6} ]] || [[ ${TRY} -ge 10 ]]; do IPV6=$(curl --connect-timeout 3 -m 10 -L6s ${IPV6_SRCS[$RANDOM % ${#IPV6_SRCS[@]} ]} | grep "^\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}$") [[ ! -z ${TRY} ]] && sleep 1 diff --git a/docker-compose.yml b/docker-compose.yml index 3cfd74bf..aaab05bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -355,7 +355,7 @@ services: acme-mailcow: depends_on: - nginx-mailcow - image: mailcow/acme:1.77 + image: mailcow/acme:1.78 dns: - ${IPV4_NETWORK:-172.22.1}.254 environment: @@ -413,7 +413,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.88 + image: mailcow/watchdog:1.89 # Debug #command: /watchdog.sh dns: