From bcc39a97f0ec733adce365d6f70f973b8528f1f4 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sun, 27 May 2018 20:38:43 -0400
Subject: [PATCH] IP detection only relies on duckduck.go

---
 Dockerfile    | 9 ++++-----
 entrypoint.sh | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b527a130..23e136f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,11 +20,10 @@ RUN apk add -q --progress --no-cache --update openvpn unbound ca-certificates &&
     apk del -q --progress --purge build-dependencies && \
     rm -rf /*.zip /etc/unbound/unbound.conf /var/cache/apk/*
 COPY unbound.conf /etc/unbound/unbound.conf
-HEALTHCHECK --interval=10m --timeout=10s --start-period=10s --retries=2 \
-            CMD VPNCITY=$(wget -qO- -T 2 https://ipinfo.io/city) && \
-                VPNORGANIZATION=$(wget -qO- -T 2 https://ipinfo.io/org) && \
-                echo "City: $VPNCITY | Organization: $VPNORGANIZATION" && \
-                [ "$VPNCITY" != "$CITY" ] && [ "$VPNORGANIZATION" != "$ORGANIZATION" ] || exit 1
+HEALTHCHECK --interval=10m --timeout=10s --start-period=10s --retries=1 \
+            CMD export OLD_VPN_IP="$NEW_VPN_IP" && \
+				export NEW_VPN_IP=$(wget -qqO- 'https://duckduckgo.com/?q=what+is+my+ip' | grep -ow 'Your IP address is [0-9.]*[0-9]' | grep -ow '[0-9][0-9.]*') && \
+				[ "$NEW_VPN_IP" != "$INITIAL_IP" ] && [ "$NEW_VPN_IP" != "$OLD_VPN_IP" ] || exit 1
 ENV ENCRYPTION=strong \
     PROTOCOL=tcp \
     REGION=Germany
diff --git a/entrypoint.sh b/entrypoint.sh
index aa69bcce..4b36784b 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-printf "\nDetecting details from public IP address..."
-export CITY=$(wget -qO- -T 2 https://ipinfo.io/city)
-export ORG=$(wget -qO- -T 2 https://ipinfo.io/org)
-printf "DONE\nOrganization: $ORG\nCity: $CITY\nChanging DNS to localhost..."
+printf "\nGetting public IP address..."
+export INITIAL_IP=$(wget -qqO- 'https://duckduckgo.com/?q=what+is+my+ip' | grep -ow 'Your IP address is [0-9.]*[0-9]' | grep -ow '[0-9][0-9.]*')
+printf "DONE\nChanging DNS to localhost..."
 echo "nameserver 127.0.0.1" > /etc/resolv.conf
 echo "options ndots:0" >> /etc/resolv.conf
 printf "DONE\nStarting Unbound to connect to Cloudflare DNS 1.1.1.1 at its TLS endpoint..."