upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-22 06:37:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only configure statistics-channels if supported

Browse source
This commit is contained in:
Mark Andrews 2024-09-03 14:59:19 +10:00
parent 31650d9440
commit d0c8c6d7ef
22 changed files with 179 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/statistics/ns1/named.conf.in
View file

@ -24,9 +24,7 @@ options {
notify yes;
};
statistics-channels {
inet 10.53.0.1 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type primary;

16
bin/tests/system/statistics/ns1/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/statistics/ns2/named.conf.in
View file

@ -26,9 +26,7 @@ options {
trust-anchors { };
statistics-channels {
inet 10.53.0.2 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
key rndc_key {
secret "1234abcd8765";

4
bin/tests/system/statistics/ns2/named2.conf.in
View file

@ -24,9 +24,7 @@ options {
notify yes;
};
statistics-channels {
inet 10.53.0.2 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
key rndc_key {
secret "1234abcd8765";

16
bin/tests/system/statistics/ns2/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/statistics/ns3/named.conf.in
View file

@ -29,9 +29,7 @@ options {
trust-anchors { };
statistics-channels {
inet 10.53.0.3 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
key rndc_key {
secret "1234abcd8765";

16
bin/tests/system/statistics/ns3/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

13
bin/tests/system/statistics/setup.sh
View file

@ -13,6 +13,13 @@
. ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
for d in ns1 ns2 ns3; 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

5
bin/tests/system/statschannel/prereq.sh
View file

@ -23,4 +23,9 @@ if ! ${PERL} -MFile::Fetch -e ''; then
exit 1
fi
if ! $FEATURETEST --have-libxml2 && ! $FEATURETEST --have-json-c; then
echo_i "skip: one or both of --with-libxml2 and --with-json-c required"
exit 255
fi
exit 0

4
bin/tests/system/synthfromdnssec/ns1/named.conf.in
View file

@ -35,9 +35,7 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.1 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type primary;

16
bin/tests/system/synthfromdnssec/ns1/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/synthfromdnssec/ns2/named.conf.in
View file

@ -35,9 +35,7 @@ controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.2 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type hint;

16
bin/tests/system/synthfromdnssec/ns2/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/synthfromdnssec/ns3/named.conf.in
View file

@ -35,9 +35,7 @@ controls {
inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.3 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type hint;

16
bin/tests/system/synthfromdnssec/ns3/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/synthfromdnssec/ns4/named.conf.in
View file

@ -36,9 +36,7 @@ controls {
inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.4 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type hint;

16
bin/tests/system/synthfromdnssec/ns4/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/synthfromdnssec/ns5/named.conf.in
View file

@ -37,9 +37,7 @@ controls {
inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.5 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type hint;

16
bin/tests/system/synthfromdnssec/ns5/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

4
bin/tests/system/synthfromdnssec/ns6/named.conf.in
View file

@ -36,9 +36,7 @@ controls {
inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
statistics-channels {
inet 10.53.0.6 port @EXTRAPORT1@ allow { any; };
};
include "statistics-channels.conf";
zone "." {
type hint;

16
bin/tests/system/synthfromdnssec/ns6/statistics-channels.conf.in Normal file
View file

@ -0,0 +1,16 @@
/*
* 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; };
};

16
bin/tests/system/synthfromdnssec/setup.sh
View file

@ -16,12 +16,16 @@
set -e
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf
copy_setports ns5/named.conf.in ns5/named.conf
copy_setports ns6/named.conf.in ns6/named.conf
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