diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 similarity index 90% rename from bin/tests/system/synthfromdnssec/ns1/named.conf.in rename to bin/tests/system/synthfromdnssec/ns1/named.conf.j2 index e0ff8da1c5..f409fe2891 100644 --- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.j2 @@ -35,7 +35,11 @@ controls { inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.1 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type primary; diff --git a/bin/tests/system/synthfromdnssec/ns1/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns1/statistics-channels.conf.in deleted file mode 100644 index 12a1e27003..0000000000 --- a/bin/tests/system/synthfromdnssec/ns1/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.1 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.in b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 similarity index 88% rename from bin/tests/system/synthfromdnssec/ns2/named.conf.in rename to bin/tests/system/synthfromdnssec/ns2/named.conf.j2 index efcf7e5d78..ca326e5d23 100644 --- a/bin/tests/system/synthfromdnssec/ns2/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.j2 @@ -35,7 +35,11 @@ controls { inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.2 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns2/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns2/statistics-channels.conf.in deleted file mode 100644 index 6dd1516962..0000000000 --- a/bin/tests/system/synthfromdnssec/ns2/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.2 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.in b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 similarity index 87% rename from bin/tests/system/synthfromdnssec/ns3/named.conf.in rename to bin/tests/system/synthfromdnssec/ns3/named.conf.j2 index 7665d8a6e6..b4fceb903c 100644 --- a/bin/tests/system/synthfromdnssec/ns3/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.j2 @@ -35,7 +35,11 @@ controls { inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.3 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns3/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns3/statistics-channels.conf.in deleted file mode 100644 index a755c39439..0000000000 --- a/bin/tests/system/synthfromdnssec/ns3/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.3 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 similarity index 86% rename from bin/tests/system/synthfromdnssec/ns4/named.conf.in rename to bin/tests/system/synthfromdnssec/ns4/named.conf.j2 index 85cbc38d98..9f55cb9dde 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.j2 @@ -36,7 +36,11 @@ controls { inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.4 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns4/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns4/statistics-channels.conf.in deleted file mode 100644 index 5a89f8d489..0000000000 --- a/bin/tests/system/synthfromdnssec/ns4/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.4 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.in b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 similarity index 88% rename from bin/tests/system/synthfromdnssec/ns5/named.conf.in rename to bin/tests/system/synthfromdnssec/ns5/named.conf.j2 index 0875b7701e..cf75599726 100644 --- a/bin/tests/system/synthfromdnssec/ns5/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.j2 @@ -37,7 +37,11 @@ controls { inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.5 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns5/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns5/statistics-channels.conf.in deleted file mode 100644 index 12a9398c60..0000000000 --- a/bin/tests/system/synthfromdnssec/ns5/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.5 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/ns6/named.conf.in b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 similarity index 86% rename from bin/tests/system/synthfromdnssec/ns6/named.conf.in rename to bin/tests/system/synthfromdnssec/ns6/named.conf.j2 index 1f631865ac..3000b47825 100644 --- a/bin/tests/system/synthfromdnssec/ns6/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns6/named.conf.j2 @@ -36,7 +36,11 @@ controls { inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -include "statistics-channels.conf"; +{% if FEATURE_LIBXML2 == "1" or FEATURE_JSON_C == "1" %} +statistics-channels { + inet 10.53.0.6 port @EXTRAPORT1@ allow { any; }; +}; +{% endif %} zone "." { type hint; diff --git a/bin/tests/system/synthfromdnssec/ns6/statistics-channels.conf.in b/bin/tests/system/synthfromdnssec/ns6/statistics-channels.conf.in deleted file mode 100644 index 138a84bde3..0000000000 --- a/bin/tests/system/synthfromdnssec/ns6/statistics-channels.conf.in +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -statistics-channels { - inet 10.53.0.6 port @EXTRAPORT1@ allow { any; }; -}; diff --git a/bin/tests/system/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh index 85feba601d..db51cff6eb 100644 --- a/bin/tests/system/synthfromdnssec/setup.sh +++ b/bin/tests/system/synthfromdnssec/setup.sh @@ -16,17 +16,6 @@ set -e -for d in ns1 ns2 ns3 ns4 ns5 ns6; do - conf=named.conf - copy_setports "${d}/${conf}.in" "${d}/${conf}" - conf=statistics-channels.conf - if $FEATURETEST --have-libxml2 || $FEATURETEST --have-json-c; then - copy_setports "${d}/${conf}.in" "${d}/${conf}" - else - echo "" >"${d}/${conf}" - fi -done - ( cd ns1 $SHELL sign.sh