From 6bd818ceeccf358be1a9beb9e589b2989149cbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Mon, 6 Aug 2018 15:15:24 +0200
Subject: [PATCH] [ACME] Remove third-party IP tools

---
 data/Dockerfiles/acme/docker-entrypoint.sh | 14 ++++----------
 docker-compose.yml                         |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/data/Dockerfiles/acme/docker-entrypoint.sh b/data/Dockerfiles/acme/docker-entrypoint.sh
index 08d234bf..c9a91dfa 100755
--- a/data/Dockerfiles/acme/docker-entrypoint.sh
+++ b/data/Dockerfiles/acme/docker-entrypoint.sh
@@ -66,12 +66,8 @@ get_ipv4(){
   local IPV4=
   local IPV4_SRCS=
   local TRY=
-  IPV4_SRCS[0]="api.ipify.org"
-  IPV4_SRCS[1]="ifconfig.co"
-  IPV4_SRCS[2]="icanhazip.com"
-  IPV4_SRCS[3]="v4.ident.me"
-  IPV4_SRCS[4]="ipecho.net/plain"
-  IPV4_SRCS[5]="ip4.mailcow.email"
+  IPV4_SRCS[0]="ip4.mailcow.email"
+  IPV4_SRCS[1]="ip4.korves.net"
   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
@@ -84,10 +80,8 @@ get_ipv6(){
   local IPV6=
   local IPV6_SRCS=
   local TRY=
-  IPV6_SRCS[0]="ifconfig.co"
-  IPV6_SRCS[1]="icanhazip.com"
-  IPV6_SRCS[2]="v6.ident.me"
-  IPV6_SRCS[3]="ip6.mailcow.email"
+  IPV6_SRCS[0]="ip6.korves.net"
+  IPV6_SRCS[1]="ip6.mailcow.email"
   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 b7fd62eb..e01bf2d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -279,7 +279,7 @@ services:
       depends_on:
         - nginx-mailcow
         - mysql-mailcow
-      image: mailcow/acme:1.36
+      image: mailcow/acme:1.37
       build: ./data/Dockerfiles/acme
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254