From 7040a443c5973be872cdf5f3a656e9f947650b2b Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sun, 4 May 2025 12:17:10 -0700 Subject: Refactor the swarm cluster role a bit --- playbooks/roles/labdns/templates/stacks/docker-compose.yml | 1 + playbooks/roles/labdns/templates/volumes/unbound/a-records.conf | 4 ++++ .../roles/labdns/templates/volumes/unbound/forward-records.conf | 7 +++---- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'playbooks/roles/labdns') diff --git a/playbooks/roles/labdns/templates/stacks/docker-compose.yml b/playbooks/roles/labdns/templates/stacks/docker-compose.yml index 3327c18..c2a2ab5 100644 --- a/playbooks/roles/labdns/templates/stacks/docker-compose.yml +++ b/playbooks/roles/labdns/templates/stacks/docker-compose.yml @@ -17,6 +17,7 @@ services: test: ["CMD-SHELL", "drill loadbalancer.{{ domain }} @127.0.0.1 | grep -q {{ loadbalancer_ip }}"] retries: 3 timeout: 5s + interval: 10s start_period: 8s {% endif %} deploy: diff --git a/playbooks/roles/labdns/templates/volumes/unbound/a-records.conf b/playbooks/roles/labdns/templates/volumes/unbound/a-records.conf index 6248b0c..5eefeb5 100644 --- a/playbooks/roles/labdns/templates/volumes/unbound/a-records.conf +++ b/playbooks/roles/labdns/templates/volumes/unbound/a-records.conf @@ -2,3 +2,7 @@ {% for service in internal_services %} local-data: "{{ service }}. A {{ loadbalancer_ip }}" {% endfor %} + +# lucina.cloud +local-zone: "lucina.cloud." redirect +local-data: "lucina.cloud. A 10.128.0.44" diff --git a/playbooks/roles/labdns/templates/volumes/unbound/forward-records.conf b/playbooks/roles/labdns/templates/volumes/unbound/forward-records.conf index ae977e7..19af327 100644 --- a/playbooks/roles/labdns/templates/volumes/unbound/forward-records.conf +++ b/playbooks/roles/labdns/templates/volumes/unbound/forward-records.conf @@ -1,6 +1,5 @@ forward-zone: name: "." - forward-addr: 10.128.0.44@53 -# forward-addr: 1.1.1.1@853#cloudflare-dns.com -# forward-addr: 1.0.0.1@853#cloudflare-dns.com -# forward-tls-upstream: yes + forward-addr: 1.1.1.1@853#cloudflare-dns.com + forward-addr: 1.0.0.1@853#cloudflare-dns.com + forward-tls-upstream: yes -- cgit v1.2.3-70-g09d2