Commit 05cf8c8c authored by Tomas Krizek's avatar Tomas Krizek

Merge branch 'respdiff-startup' into 'master'

contrib/respdiff: improve resolver startup order

See merge request !42
parents 8ca19d77 b0763a33
Pipeline #43006 passed with stage
in 2 minutes and 34 seconds
......@@ -5,6 +5,11 @@ services:
{{ name }}:
network_mode: host
{%- if 'depends_on' in resolver %}
depends_on:
- {{ resolver['depends_on'] }}
{%- endif -%}
{%- if resolver['type'] == 'knot-resolver' %}
build:
context: ./docker-knot-resolver
......
......@@ -41,3 +41,7 @@ modules = {
'view', -- Views for certain clients
'stats', -- Track internal statistics
}
modules.unload("ta_signal_query")
modules.unload("priming")
modules.unload("detect_time_skew")
......@@ -22,6 +22,7 @@ resolvers:
bind:
type: bind
port: &bind_port 53711
depends_on: unbound
forward: &fwd_unbound
ip: 127.0.0.1
port: *unbound_port
......@@ -35,6 +36,7 @@ resolvers:
type: knot-resolver
port: 53722
tls_port: &kresd_fwd_target_port 53729
depends_on: unbound
forward: *fwd_unbound
listen_ipv6: true
......@@ -42,6 +44,7 @@ resolvers:
type: knot-resolver
port: &kresd_port 53721
listen_ipv6: true
depends_on: kresd_fwd_target
forward:
ip: '::1'
port: *kresd_fwd_target_port
......
......@@ -18,6 +18,7 @@ resolvers:
unbound:
type: unbound
port: &unbound_port 53601
depends_on: kresd_fwd_target
forward: &fwd_kresd
ip: '::1'
port: *kresd_fwd_target_port
......@@ -30,6 +31,7 @@ resolvers:
bind:
type: bind
port: &bind_port 53611
depends_on: kresd_fwd_target
forward: *fwd_kresd
respdiff:
ip: 127.0.0.1
......@@ -41,6 +43,7 @@ resolvers:
type: knot-resolver
port: &kresd_port 53621
listen_ipv6: true
depends_on: kresd_fwd_target
forward: *fwd_kresd
respdiff:
ip: '::1'
......
......@@ -23,6 +23,7 @@ resolvers:
bind:
type: bind
port: &bind_port 53411
depends_on: unbound
forward: &fwd_unbound
ip: '::1'
port: *unbound_port
......@@ -36,6 +37,7 @@ resolvers:
type: knot-resolver
port: &kresd_port 53421
listen_ipv6: true
depends_on: unbound
forward: *fwd_unbound
respdiff:
ip: '::1'
......
......@@ -23,6 +23,7 @@ resolvers:
bind:
type: bind
port: &bind_port 53211
depends_on: unbound
forward: &fwd_unbound
ip: '::1'
port: *unbound_port
......@@ -37,6 +38,7 @@ resolvers:
port: 53221
tls_port: &kresd_tls_port 53228
listen_ipv6: true
depends_on: unbound
forward: *fwd_unbound
respdiff:
ip: '::1'
......
......@@ -23,6 +23,7 @@ resolvers:
bind:
type: bind
port: &bind_port 53311
depends_on: unbound
forward: &fwd_unbound
ip: '::1'
port: *unbound_port
......@@ -36,6 +37,7 @@ resolvers:
type: knot-resolver
port: &kresd_port 53321
listen_ipv6: true
depends_on: unbound
forward: *fwd_unbound
respdiff:
ip: '::1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment