ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Remove bin/tests/system/logfileconfig/ns1/named.conf and add setup.sh

Browse Source 
in order to resolve changing named.conf issue.  [RT #23687]
This commit is contained in:
Scott Mann
2011-03-22 19:10:41 +00:00
parent 1eaf06992a
commit 9fcade3a09
5 changed files with 31 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/logfileconfig/clean.sh
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.2.2.3 2011/03/05 23:51:01 tbox Exp $
# $Id: clean.sh,v 1.2.2.4 2011/03/22 19:10:40 smann Exp $
#
# Clean up after log file tests
@@ -22,5 +22,5 @@
rm -f ns1/named.pid ns1/named.run
rm -f ns1/named.memstats ns1/dig.out
rm -f ns1/named_log ns1/named_pipe ns1/named_sym
rm -f ns1/named.conf
rm -rf ns1/named_dir
cp ns1/named.plain ns1/named.conf

57
bin/tests/system/logfileconfig/ns1/named.conf
View File

@@ -1,57 +0,0 @@
/*
* Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC 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: named.conf,v 1.2.2.5 2011/03/12 04:48:02 marka Exp $ */
options {
query-source address 10.53.0.1;
notify-source 10.53.0.1;
transfer-source 10.53.0.1;
port 5300;
pid-file "named.pid";
listen-on port 5300 {
10.53.0.1;
};
listen-on-v6 { none; };
recursion no;
notify yes;
};
logging {
channel default_log {
file "named_log";
print-time yes;
};
category default { default_log; default_debug; };
category lame-servers { null; };
};
controls {
inet 127.0.0.1 port 9593 allow {
127.0.0.1/32; ::1/128; }
keys { "rndc-key"; };
};
key "rndc-key" {
algorithm hmac-md5;
secret "Am9vCg==";
};
zone "." {
type master;
file "root.db";
};

24
bin/tests/system/logfileconfig/setup.sh Normal file
View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC 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: setup.sh,v 1.2.6.2 2011/03/22 19:10:41 smann Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
sh clean.sh
cp ns1/named.plain ns1/named.conf

5
bin/tests/system/logfileconfig/tests.sh
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.2.2.4 2011/03/07 16:10:33 smann Exp $
# $Id: tests.sh,v 1.2.2.5 2011/03/22 19:10:41 smann Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -38,9 +38,6 @@ myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -d 99"
#
$PERL ../stop.pl . ns1
# Make sure everything is cleaned up
sh ./clean.sh
cd $CONFDIR
$myNAMED > /dev/null 2>&1