From 7249300064d30da520183e31fd910e0601eb4412 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 31 Jan 2018 14:41:45 +0100 Subject: [PATCH] ci: configure servers to use IPv4 in respdiff IPv6 isn't currently supported in our Docker image and using it during resolution leads to a larger amount of timeouts. --- ci/Dockerfile | 3 ++- ci/respdiff/kresd.config | 3 +-- ci/respdiff/respdiff-tcp.conf | 2 +- ci/respdiff/respdiff-tls.conf | 2 +- ci/respdiff/respdiff-udp.conf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 86dba2022..53c8e1838 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -61,10 +61,11 @@ RUN pip3 install flake8 # Unbound for respdiff RUN apt-get install unbound unbound-anchor -y -qqq -RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf +RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\n do-ip6: no\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf # BIND for respdiff RUN apt-get install bind9 -y -qqq +RUN printf '\nOPTIONS="-4 $OPTIONS"' >> /etc/default/bind9 RUN printf 'options {\n directory "/var/cache/bind";\n listen-on port 53533 { 127.0.0.1; };\n listen-on-v6 port 53533 { ::1; };\n};\n' > /etc/bind/named.conf.options # PowerDNS Recursor for Deckard CI diff --git a/ci/respdiff/kresd.config b/ci/respdiff/kresd.config index 98d62f17f..038043589 100644 --- a/ci/respdiff/kresd.config +++ b/ci/respdiff/kresd.config @@ -1,9 +1,8 @@ -- Refer to manual: https://knot-resolver.readthedocs.io/en/latest/daemon.html#configuration -- Listen on localhost and external interface net.listen('127.0.0.1', 5353) -net.listen('::1', 5353) net.listen('127.0.0.1', 8853, { tls = true }) -net.listen('::1', 8853, { tls = true }) +net.ipv6=false -- Auto-maintain root TA trust_anchors.file = '.local/etc/knot-resolver/root.keys' diff --git a/ci/respdiff/respdiff-tcp.conf b/ci/respdiff/respdiff-tcp.conf index 3c07b6859..6f7abb32f 100644 --- a/ci/respdiff/respdiff-tcp.conf +++ b/ci/respdiff/respdiff-tcp.conf @@ -12,7 +12,7 @@ names = kresd, bind, unbound # each symbolic name in [servers] section refers to config section # containing IP address and port of particular server [kresd] -ip = ::1 +ip = 127.0.0.1 port = 5353 transport = tcp diff --git a/ci/respdiff/respdiff-tls.conf b/ci/respdiff/respdiff-tls.conf index 552546a65..ba405289d 100644 --- a/ci/respdiff/respdiff-tls.conf +++ b/ci/respdiff/respdiff-tls.conf @@ -12,7 +12,7 @@ names = kresd, bind, unbound # each symbolic name in [servers] section refers to config section # containing IP address and port of particular server [kresd] -ip = ::1 +ip = 127.0.0.1 port = 8853 transport = tls diff --git a/ci/respdiff/respdiff-udp.conf b/ci/respdiff/respdiff-udp.conf index 8c6e9c15c..6b8cced2c 100644 --- a/ci/respdiff/respdiff-udp.conf +++ b/ci/respdiff/respdiff-udp.conf @@ -12,7 +12,7 @@ names = kresd, bind, unbound # each symbolic name in [servers] section refers to config section # containing IP address and port of particular server [kresd] -ip = ::1 +ip = 127.0.0.1 port = 5353 transport = udp -- 2.47.2