From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 28 Jan 2019 20:50:15 +0000 (+0100)
Subject: travis auth: install dnsmasq, configure it on 127.0.0.53
X-Git-Tag: auth-4.2.0-beta1~39^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=869c68a491cd79e8d04d8750fa68b298312937dc;p=pdns

travis auth: install dnsmasq, configure it on 127.0.0.53
---

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index b2abe2370..aaae8a678 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -328,6 +328,19 @@ install_auth() {
     faketime"
   run "sudo touch /etc/authbind/byport/53"
   run "sudo chmod 755 /etc/authbind/byport/53"
+
+  # Install dnsmasq to make lookups more robust
+  run "sudo apt-get -qq --no-install-recommends install \
+    dnsmasq"
+  run 'echo listen-address=127.0.0.53 | sudo tee /etc/dnsmasq.d/local.conf'
+  run 'echo bind-interfaces | sudo tee -a /etc/dnsmasq.d/local.conf'
+
+  ## WARNING
+  ## after this dnsmasq restart, DNS lookups will fail for a few seconds.
+  run 'sudo service dnsmasq restart'
+  run "sudo resolvconf --disable-updates"
+  run 'echo nameserver 127.0.0.53 | sudo tee /etc/resolv.conf'
+  run "export RESOLVERIP=127.0.0.53"
 }
 
 install_ixfrdist() {
diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index af1a10f55..1a9e15eda 100644
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -37,7 +37,7 @@ gsql_master()
 
 	$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 		--config-name=$backend --socket-dir=./ --no-shuffle \
-		--dnsupdate=yes --resolver=8.8.8.8 --outgoing-axfr-expand-alias=yes \
+		--dnsupdate=yes --resolver=$RESOLVERIP --outgoing-axfr-expand-alias=yes \
 		--expand-alias=yes \
 		--cache-ttl=$cachettl --dname-processing \
 		--disable-axfr-rectify=yes $lua_prequery &
diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index d347d11cf..6f26c21f3 100644
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -28,7 +28,7 @@ __EOF__
 			--config-name=ldap --socket-dir=./ --no-shuffle \
 			--query-logging --dnsupdate=yes \
       --expand-alias=yes --outgoing-axfr-expand-alias=yes \
-      --resolver=8.8.8.8 \
+      --resolver=$RESOLVERIP \
 			--cache-ttl=$cachettl --dname-processing $lua_prequery &
 
 		skipreasons="nodnssec noent nodyndns nometa noaxfr"
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index ea99f91b8..9eff25648 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -16,6 +16,7 @@ export ZONE2SQL=${ZONE2SQL:-${PWD}/../pdns/zone2sql}
 export ZONE2LDAP=${ZONE2LDAP:-${PWD}/../pdns/zone2ldap}
 export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
 export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
+export RESOLVERIP=${RESOLVERIP:-8.8.8.8}
 
 
 ALGORITHM=${ALGORITHM:="hmac-md5"}