[ACME] Remove third-party IP tools

master
André 2018-08-06 15:15:24 +02:00
parent d83537cda0
commit 6bd818ceec
2 changed files with 5 additions and 11 deletions

View File

@ -66,12 +66,8 @@ get_ipv4(){
local IPV4= local IPV4=
local IPV4_SRCS= local IPV4_SRCS=
local TRY= local TRY=
IPV4_SRCS[0]="api.ipify.org" IPV4_SRCS[0]="ip4.mailcow.email"
IPV4_SRCS[1]="ifconfig.co" IPV4_SRCS[1]="ip4.korves.net"
IPV4_SRCS[2]="icanhazip.com"
IPV4_SRCS[3]="v4.ident.me"
IPV4_SRCS[4]="ipecho.net/plain"
IPV4_SRCS[5]="ip4.mailcow.email"
until [[ ! -z ${IPV4} ]] || [[ ${TRY} -ge 10 ]]; do 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]?)$") 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 [[ ! -z ${TRY} ]] && sleep 1
@ -84,10 +80,8 @@ get_ipv6(){
local IPV6= local IPV6=
local IPV6_SRCS= local IPV6_SRCS=
local TRY= local TRY=
IPV6_SRCS[0]="ifconfig.co" IPV6_SRCS[0]="ip6.korves.net"
IPV6_SRCS[1]="icanhazip.com" IPV6_SRCS[1]="ip6.mailcow.email"
IPV6_SRCS[2]="v6.ident.me"
IPV6_SRCS[3]="ip6.mailcow.email"
until [[ ! -z ${IPV6} ]] || [[ ${TRY} -ge 10 ]]; do 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\}$") 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 [[ ! -z ${TRY} ]] && sleep 1

View File

@ -279,7 +279,7 @@ services:
depends_on: depends_on:
- nginx-mailcow - nginx-mailcow
- mysql-mailcow - mysql-mailcow
image: mailcow/acme:1.36 image: mailcow/acme:1.37
build: ./data/Dockerfiles/acme build: ./data/Dockerfiles/acme
dns: dns:
- ${IPV4_NETWORK:-172.22.1}.254 - ${IPV4_NETWORK:-172.22.1}.254