Mark the configs that deliberately keep a custom controls config

Every remaining deviation from the shared _common/controls.conf.j2
include is intentional; annotate each with a one-line grep-able
comment stating why:

- rndc/ns2 and ns5 test multi-key and read-only channels; ns4 gets a
  runtime-generated multi-key channel appended by setup.sh;
- resolver/ns9 runs an IPv6-only channel, which the IPv4-only shared
  template cannot express;
- shutdown/resolver lives in a non-ns<N> directory, so the template's
  ns.ip variable is not injected there.

Assisted-by: Claude:claude-fable-5

diff --git a/bin/tests/system/resolver/ns9/named.conf.j2 b/bin/tests/system/resolver/ns9/named.conf.j2
index ea71df45dc3616457298566f1c5cccd7ec44d1fb..2ad6945f57549c5dc1862c8776c8228ca978868e 100644 (file)
--- a/bin/tests/system/resolver/ns9/named.conf.j2
+++ b/bin/tests/system/resolver/ns9/named.conf.j2
@@ -19,6 +19,7 @@ key rndc_key {
        algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: IPv6 control channel; the shared template is IPv4-only */
 controls {
        inet fd92:7065:b8e:ffff::9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };

diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2
index eac6dcddb110fec05aa56781b97c334f102d0a54..dca29075a27a86208a16740a7c371abc419fca6e 100644 (file)
--- a/bin/tests/system/rndc/ns2/named.conf.j2
+++ b/bin/tests/system/rndc/ns2/named.conf.j2
@@ -18,6 +18,7 @@ key secondkey {
        algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: multi-key control channel is the test subject */
 controls {
        inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; secondkey; };
 };

diff --git a/bin/tests/system/rndc/ns4/named.conf.j2 b/bin/tests/system/rndc/ns4/named.conf.j2
index 02e58eb47985565267f713c3d2f7de30bda752e4..4e89362ba626cac54dcfbf9788ee8d849ba7cdc8 100644 (file)
--- a/bin/tests/system/rndc/ns4/named.conf.j2
+++ b/bin/tests/system/rndc/ns4/named.conf.j2
@@ -1,3 +1,4 @@
+/* deliberately not _common/controls.conf.j2: setup.sh appends a runtime-generated multi-key channel on EXTRAPORT7 */
 options {
        port @PORT@;
        pid-file "named.pid";

diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2
index a33741a686b4da8de2f66f04bd5c0fa20d96c55e..15bb0e7f882d185da41c85610b13592727c8ef2a 100644 (file)
--- a/bin/tests/system/rndc/ns5/named.conf.j2
+++ b/bin/tests/system/rndc/ns5/named.conf.j2
@@ -12,6 +12,7 @@ key rndc_key {
        algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: read-only control channel is the test subject */
 controls {
        inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes;
 };

diff --git a/bin/tests/system/shutdown/resolver/named.conf.j2 b/bin/tests/system/shutdown/resolver/named.conf.j2
index da4fc49355396405bfac56c8e5ee0b2bf1862ca7..f78c79471924e4c03f697679a67215891f07d31e 100644 (file)
--- a/bin/tests/system/shutdown/resolver/named.conf.j2
+++ b/bin/tests/system/shutdown/resolver/named.conf.j2
@@ -12,6 +12,7 @@ key rndc_key {
        algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: non-ns<N> directory without the ns.ip template variable */
 controls {
        inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };