beug.k/DDI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

chore(deploy): include ddi-suite-keys.conf before ddi-suite.conf

Browse Source 
The development and end-to-end named.conf include the TSIG keys file, which starts empty, so named starts before the first revision.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
sir_melonchen
2026-10-14 19:42:53 +02:00
co-authored by Claude Opus 5.5
parent 8c7f7e8bfc
commit e32a30cfeb
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/compose/bind/ddi-suite/ddi-suite-keys.conf
+4
View File
@@ -0,0 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
//
// Seed for the development environment: no TSIG keys yet. From M5 on, the
// DNS agent writes the keys of the revision here (ADR 0023).
deploy/compose/bind/named.conf
+4 -2
View File
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
//
// Development BIND configuration. On managed hosts the distribution's
// named.conf only needs the include line below; everything else under
// /etc/bind/ddi-suite is written by the DNS agent (ADR 0004).
// named.conf only needs the include lines below (the keys before the
// zones); everything else under /etc/bind/ddi-suite is written by the DNS
// agent (ADR 0004, ADR 0023).
options {
directory "/var/cache/bind";
@@ -15,4 +16,5 @@ options {
dnssec-validation no;
};
include "/etc/bind/ddi-suite/ddi-suite-keys.conf";
include "/etc/bind/ddi-suite/ddi-suite.conf";
test/e2e/bind/entrypoint.sh
+1 -1
View File
@@ -10,7 +10,7 @@ if [ ! -f /etc/bind/rndc.key ]; then
rndc-confgen -a -A hmac-sha256 -k rndc-key -c /etc/bind/rndc.key
fi
# Empty includes until the agent writes the first revision.
for f in ddi-suite.conf ddi-suite-options.conf; do
for f in ddi-suite.conf ddi-suite-options.conf ddi-suite-keys.conf; do
[ -f "$conf/$f" ] || : >"$conf/$f"
done
chown -R root:bind "$conf" /etc/bind/rndc.key
test/e2e/bind/named.conf
+4 -2
View File
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
//
// Distribution-like named.conf for the end-to-end test: it only adds the
// rndc channel and the two include files written by the DNS agent. Options
// the generator sets (recursion, forwarders, transfers) must not appear here.
// rndc channel and the three include files written by the DNS agent (the
// keys before the zones). Options the generator sets (recursion,
// forwarders, transfers) must not appear here.
include "/etc/bind/rndc.key";
@@ -19,4 +20,5 @@ options {
include "/etc/bind/ddi-suite/ddi-suite-options.conf";
};
include "/etc/bind/ddi-suite/ddi-suite-keys.conf";
include "/etc/bind/ddi-suite/ddi-suite.conf";