remove nginx resolver directive

and try to rely on our resolver exclusively
3scale · Jan 20, 2017 · c1a3eef · c1a3eef
1 parent b0ef31c
commit c1a3eef
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/apicast/.s2i/bin/assemble b/apicast/.s2i/bin/assemble
diff --git a/apicast/bin/entrypoint b/apicast/bin/entrypoint
@@ -17,34 +17,6 @@ if [ "${AUTO_UPDATE_INTERVAL}" != 0 ] && [ "${AUTO_UPDATE_INTERVAL}" -lt 60 ]; t
   exit 1
 fi
 
-pick_dns_server() {
-  DNS=$(grep nameserver /etc/resolv.conf | awk {'print $2'})
-
-  if [ -z "$DNS" ]; then
-    echo "127.0.0.1"
-  else
-    for server in $DNS; do
-      if (nslookup -timeout=1 -retry=3 redhat.com "$server" &> /dev/null); then
-        echo "$server"
-	 exit 0
-      fi
-    done
-
-    (>&2 echo "error: no working DNS server found")
-    exit 1
-  fi
-}
-
-
-export NAMESERVER
-
-NAMESERVER=$(pick_dns_server)
-
-export RESOLVER=${RESOLVER:-${NAMESERVER}}
-
-mkdir -pv "$(pwd)/http.d"
-echo "resolver ${RESOLVER};" > "$(pwd)/http.d/resolver.conf"
-
 THREESCALE_PORTAL_ENDPOINT="${THREESCALE_PORTAL_ENDPOINT:-}"
 THREESCALE_CONFIG_FILE="${THREESCALE_CONFIG_FILE:-}"
 

diff --git a/apicast/http.d/resolver.conf b/apicast/http.d/resolver.conf