upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include controls.conf as jinja2 template

Browse source 
Rather than using named.conf include, render the controls directly into
the config using jinja2 template include.
This commit is contained in:
Nicki Křížek 2026-04-01 18:25:28 +02:00
parent e34c3252d9
commit f4ca352bc8
40 changed files with 37 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/tests/system/_common/controls.conf.in
View file

@ -1,9 +0,0 @@
key rndc_key {
secret "1234abcd8765";
algorithm @DEFAULT_HMAC@;
};
controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};

4
bin/tests/system/_common/controls.conf.j2 Normal file
View file

@ -0,0 +1,4 @@
{% include "_common/rndc.key" %}
controls {
inet @ns.ip@ port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};

1
bin/tests/system/allow_query/.gitignore vendored
View file

@ -1,2 +1 @@
/ns2/named.conf
/ns2/controls.conf

1
bin/tests/system/allow_query/ns2/controls.conf.j2
View file

@ -1 +0,0 @@
../../_common/controls.conf.in

2
bin/tests/system/allow_query/ns2/named.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named02.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named03.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named04.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named05.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named06.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named07.conf.j2
View file

@ -10,7 +10,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named08.conf.j2
View file

@ -10,7 +10,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named09.conf.j2
View file

@ -10,7 +10,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named10.conf.j2
View file

@ -13,7 +13,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named11.conf.j2
View file

@ -19,7 +19,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named12.conf.j2
View file

@ -13,7 +13,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named21.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named22.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named23.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named24.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named25.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named26.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named27.conf.j2
View file

@ -9,7 +9,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named28.conf.j2
View file

@ -9,7 +9,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named29.conf.j2
View file

@ -9,7 +9,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named30.conf.j2
View file

@ -12,7 +12,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named31.conf.j2
View file

@ -19,7 +19,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named32.conf.j2
View file

@ -12,7 +12,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named33.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named34.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named40.conf.j2
View file

@ -21,7 +21,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named53.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named54.conf.j2
View file

@ -8,7 +8,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
zone "." {
type hint;

2
bin/tests/system/allow_query/ns2/named55.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named56.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {

2
bin/tests/system/allow_query/ns2/named57.conf.j2
View file

@ -7,7 +7,7 @@ options {
dnssec-validation no;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
view "internal" {
allow-query-on { any; };

1
bin/tests/system/allow_query/tests_sh_allow_query.py
View file

@ -14,7 +14,6 @@ import pytest
pytestmark = pytest.mark.extra_artifacts(
[
"dig.out.*",
"ns2/controls.conf",
]
)

1
bin/tests/system/optout/ns2/controls.conf.j2
View file

@ -1 +0,0 @@
../../_common/controls.conf.in

2
bin/tests/system/optout/ns2/named.conf.j2
View file

@ -14,7 +14,7 @@ options {
sig-signing-signatures 900;
};
include "controls.conf";
{% include "_common/controls.conf.j2" %}
dnssec-policy "optout" {
keys {

1
bin/tests/system/optout/tests_optout.py
View file

@ -34,7 +34,6 @@ pytestmark = [
"ns2/*.signed",
"ns2/*.jnl",
"ns2/*.jbk",
"ns2/controls.conf",
"ns2/dsset-*",
"ns2/K*",
]