Commit c877d7db authored by Andreas Gustafsson's avatar Andreas Gustafsson
Browse files

use common configuration files

parent bfc41f13
......@@ -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;
......
......@@ -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; };
......
/*
* 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";
};
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment