From ba7ea2dfac98a976efac2dcb6620b2c10f4e94da Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Fri, 7 Oct 2022 16:23:56 +0200 Subject: [PATCH] Remove generated controls.conf file from system tests The controls.conf file shouldn't be used directly without templating it first. Remove this no longer used hard-coded file to avoid confusion. (cherry picked from commit cbd035532810965f61ee814803dff2592b7cf5fc) --- bin/tests/system/common/controls.conf | 22 ------------------- .../system/synthfromdnssec/ns4/named.conf.in | 1 - 2 files changed, 23 deletions(-) delete mode 100644 bin/tests/system/common/controls.conf diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf deleted file mode 100644 index 36bd38d0b6..0000000000 --- a/bin/tests/system/common/controls.conf +++ /dev/null @@ -1,22 +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. - */ - -key rndc_key { - secret "1234abcd8765"; - algorithm hmac-sha256; -}; - -controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; -}; - diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.in index 780562ffcd..c9d921092e 100644 --- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in +++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.in @@ -46,4 +46,3 @@ zone "." { }; include "../ns1/trusted.conf"; -// include "../../common/controls.conf";