From 0c71240182506e56a505859eaa0b86dfc932bee7 Mon Sep 17 00:00:00 2001 From: 135 Date: Fri, 30 Jun 2023 16:09:38 +0300 Subject: [PATCH 1/2] Use own MNAME because no primary/secondary logic exists (https://datatracker.ietf.org/doc/html/rfc1035#section-3.3.13). So each service should use own MNAME. --- Makefile | 3 +++ domain.sql.sample | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index e866cc9..0a1498e 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,9 @@ PGPASSWORD ?= #- ACME zone suffix ACME_DOMAIN ?= +#- This NS for use in SOA +NSERVER ?= + # ------------------------------------------------------------------------------ all: help diff --git a/domain.sql.sample b/domain.sql.sample index 9e6223a..0344257 100644 --- a/domain.sql.sample +++ b/domain.sql.sample @@ -2,17 +2,19 @@ Complete PowerDNS zone records */ +SET vars.ns TO :'NSERVER'; + DO $_$ DECLARE - v_domain text := 'dev.lan'; -- domain name - v_ip text := '127.0.0.1'; -- base ip - v_ip1 text := '127.0.1.1'; -- some another ip - v_ns text := 'ns.dev.lan'; -- master DNS host - v_ns_admin text := 'admin.ns.dev.lan'; -- master DNS admin email - v_domain_id integer; -- internal domain id - v_stamp text; -- zone SOA timestamp - v_stamp_old text; -- previous zone SOA timestamp - v_soa text; -- zone SOA + v_domain text := 'dev.lan'; -- domain name + v_ip text := '127.0.0.1'; -- base ip + v_ip1 text := '127.0.1.1'; -- some another ip + v_ns text := current_setting('vars.ns'); -- master DNS host + v_ns_admin text := 'admin.ns.dev.lan'; -- master DNS admin email + v_domain_id integer; -- internal domain id + v_stamp text; -- zone SOA timestamp + v_stamp_old text; -- previous zone SOA timestamp + v_soa text; -- zone SOA v_refresh int := 10800; v_retry int := 3600; From 35087ccc6b74bed56dda66a3da636d2d2639c5aa Mon Sep 17 00:00:00 2001 From: 135 Date: Fri, 30 Jun 2023 16:40:27 +0300 Subject: [PATCH 2/2] put new variable NSERVER to sql --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0a1498e..e3f8333 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ update: $(OBJECTS) %.done: %.sql @echo "*** $< ***" @csum=$$(md5sum $< | sed 's/ .*//') ; \ - cat $< | docker exec -i $$PG_CONTAINER psql -U $$PGUSER -d $$PGDATABASE -vcsum=$$csum -vACME_DOMAIN=$(ACME_DOMAIN) > $@ + cat $< | docker exec -i $$PG_CONTAINER psql -U $$PGUSER -d $$PGDATABASE -vcsum=$$csum -vACME_DOMAIN=$(ACME_DOMAIN) -vNSERVER=$(NSERVER) > $@ ## Load updated zone files via psql connection update-direct: $(CFG) $(OBJECTSDIRECT)