aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLexi Winter <lexi@le-fay.org>2025-07-17 05:02:09 +0100
committerLexi Winter <lexi@le-fay.org>2025-07-17 05:02:09 +0100
commit006bf883cac17da85134c67c20f85f90a6950336 (patch)
tree1633c27254e226b6a841a965f9d28f48ad736a9c
parentcd27c6e130c8370fcc5c4bb17bd240e01ba8f8b9 (diff)
downloaddns-006bf883cac17da85134c67c20f85f90a6950336.tar.gz
dns-006bf883cac17da85134c67c20f85f90a6950336.tar.bz2
Makefile: fixes
-rw-r--r--Makefile5
-rw-r--r--Makefile.inc.unbound1
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d731e12..9e30bc3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@
### Our local master server.
MASTER= lily.le-fay.org
-MASTER_ADDR!= getaddrinfo -f inet6 -p tcp -t stream ${MASTER} \
+MASTER_ADDR!= set -o pipefail; \
+ getaddrinfo -f inet6 -p tcp -t stream ${MASTER} \
| awk '{ print $$4 }'
@@ -26,6 +27,8 @@ TTL= 1h
NAMESERVERS= ns1.le-fay.org \
ns2.le-fay.org \
ns3.le-fay.org
+NS_ADDRS!= set -o pipefail; \
+ getent hosts ${NAMESERVERS} | awk '{print $$1}'
### The DN42 master server.
diff --git a/Makefile.inc.unbound b/Makefile.inc.unbound
index db6f1fb..7dad766 100644
--- a/Makefile.inc.unbound
+++ b/Makefile.inc.unbound
@@ -8,6 +8,7 @@ UNBOUND_PROCESS_FLAGS?= \
-Dconfdir=/usr/local/etc/unbound \
-Dmaster="${MASTER}" \
-Dmaster_addr="${MASTER_ADDR}" \
+ -Dns_addrs="${NS_ADDRS}" \
-Dlocal_zones="${ZONES}" \
-Dinsecure_zones="${INSECURE_ZONES}" \
-Ddn42_zones="${DN42_ZONES}" \