From c877d7db8f60734d272ace824c04bce9b0a1e8fe Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Mon, 18 Dec 2000 23:24:24 +0000 Subject: [PATCH] use common configuration files --- bin/tests/system/views/ns2/named1.conf | 11 ++--------- bin/tests/system/views/ns2/named2.conf | 7 ++----- bin/tests/system/views/rndc.conf | 27 -------------------------- bin/tests/system/views/tests.sh | 6 +++--- util/copyrights | 1 - 5 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 bin/tests/system/views/rndc.conf diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf index 98d44acce7..197ff82b8a 100644 --- a/bin/tests/system/views/ns2/named1.conf +++ b/bin/tests/system/views/ns2/named1.conf @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.13 2000/11/28 19:06:50 gson Exp $ */ +/* $Id: named1.conf,v 1.14 2000/12/18 23:24:23 gson Exp $ */ options { query-source address 10.53.0.2; @@ -29,14 +29,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm hmac-md5; -}; - -controls { - inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; }; -}; +include "../../common/controls.conf"; zone "." { type hint; diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf index 6b9fca7aa8..4c22343833 100644 --- a/bin/tests/system/views/ns2/named2.conf +++ b/bin/tests/system/views/ns2/named2.conf @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.14 2000/11/28 19:06:51 gson Exp $ */ +/* $Id: named2.conf,v 1.15 2000/12/18 23:24:24 gson Exp $ */ options { query-source address 10.53.0.2; @@ -29,10 +29,7 @@ options { notify yes; }; -key rndc_key { - secret "1234abcd8765"; - algorithm hmac-md5; -}; +include "../../common/controls.conf"; controls { inet 10.53.0.2 port 11953 allow { any; } keys { rndc_key; }; diff --git a/bin/tests/system/views/rndc.conf b/bin/tests/system/views/rndc.conf deleted file mode 100644 index e570dc71d5..0000000000 --- a/bin/tests/system/views/rndc.conf +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2000 Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM - * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: rndc.conf,v 1.3 2000/08/01 01:16:46 tale Exp $ */ - -options { - default-key "rndc_key"; -}; - -key rndc_key { - algorithm hmac-md5; - secret "1234abcd8765"; -}; diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 0d1e8557a8..56af567d21 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.23 2000/11/22 19:00:46 gson Exp $ +# $Id: tests.sh,v 1.24 2000/12/18 23:24:22 gson Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -40,8 +40,8 @@ cp ns2/example2.db ns2/example.db echo "I:sleeping five seconds then reloading ns2 and ns3 with rndc" sleep 5 -$RNDC -c rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /' -$RNDC -c rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /' +$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /' +$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /' echo "I:sleeping one minute" sleep 60 diff --git a/util/copyrights b/util/copyrights index 131957f3cf..57fee57d88 100644 --- a/util/copyrights +++ b/util/copyrights @@ -559,7 +559,6 @@ ./bin/tests/system/views/ns3/named1.conf CONF-C 2000 ./bin/tests/system/views/ns3/named2.conf CONF-C 2000 ./bin/tests/system/views/ns3/root.hint ZONE 2000 -./bin/tests/system/views/rndc.conf CONF-C 2000 ./bin/tests/system/views/setup.sh SH 2000 ./bin/tests/system/views/tests.sh SH 2000 ./bin/tests/system/xfer/clean.sh SH 2000