From: Nicki Křížek Date: Fri, 5 Dec 2025 16:18:20 +0000 (+0100) Subject: Use jinja2 templates in tsiggss X-Git-Tag: v9.21.17~46^2~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa2f7249a5c5bc36397fe0f9d89cef4d37ed817;p=thirdparty%2Fbind9.git Use jinja2 templates in tsiggss - The ns1/named.conf.j2 contains "@" which is a special jinja character, use the raw directive to escape it. --- diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.j2 similarity index 98% rename from bin/tests/system/tsiggss/ns1/named.conf.in rename to bin/tests/system/tsiggss/ns1/named.conf.j2 index 7b34c3297f8..4220564daaa 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.in +++ b/bin/tests/system/tsiggss/ns1/named.conf.j2 @@ -39,11 +39,13 @@ zone "example.nil." IN { type primary; file "example.nil.db"; +{% raw %} update-policy { grant Administrator@EXAMPLE.NIL wildcard * A AAAA SRV CNAME; grant testdenied@EXAMPLE.NIL wildcard * TXT; grant "local:auth.sock" external * CNAME; }; +{% endraw %} /* we need to use check-names ignore so _msdcs A records can be created */ check-names ignore; diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh index ec3e99e1e06..67606b856d4 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh @@ -13,7 +13,5 @@ . ../conf.sh -copy_setports ns1/named.conf.in ns1/named.conf - key=$($KEYGEN -Cq -K ns1 -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -T KEY key.example.nil.) cat ns1/example.nil.db.in ns1/${key}.key >ns1/example.nil.db