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 7b34c3297f822e849700a37e919cbb0b13a6c8f2..4220564daaa52fa338849b5e910d7080e3c60763 100644 (file)
--- 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 ec3e99e1e0611a26d7ca158d21addadc03943209..67606b856d4ee4dc0f0e44f3617eaca4d7a4f4fe 100644 (file)
--- 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