summaryrefslogtreecommitdiff
path: root/wintest/conf
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-12 18:34:41 +1000
committerStefan Metzmacher <metze@samba.org>2012-09-12 16:51:29 +0200
commitee4d1c406208d67aaa949934da78cd350e69ccf0 (patch)
tree7007d68b8f96ebf4ead42c34c739622f41872186 /wintest/conf
parentfee75752fb9f0926bc9d7ea5731ef72d2197b9e3 (diff)
downloadsamba-ee4d1c406208d67aaa949934da78cd350e69ccf0.tar.gz
samba-ee4d1c406208d67aaa949934da78cd350e69ccf0.tar.bz2
samba-ee4d1c406208d67aaa949934da78cd350e69ccf0.zip
wintest: Rework support for the internal DNS server
We still have to run BIND, the change is if BIND is run to support our own zone, or if we forward to as well as to windows. This also adapts to the new defaults. Andrew Bartlett Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'wintest/conf')
-rw-r--r--wintest/conf/abartlet.conf12
1 files changed, 9 insertions, 3 deletions
diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index 8e6830f75c..78c0287678 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -16,11 +16,17 @@ VM_RESET : virsh reboot ${VMNAME}
# interfaces to create
INTERFACE : virbr0:0
+NAMED_INTERFACE : virbr0:1
# this is an additional IP that will be used for named to listen
-# on. It should not be the primary IP of the interface
-INTERFACE_IP : 192.168.122.2
-INTERFACE_NET : 192.168.122.2/24
+# on. It should not be the primary IP of the interface. We need one
+# for BIND (which redirects to the other hosts) and one for Samba,
+# which might be running our own DNS
+
+INTERFACE_IP : 192.168.122.3
+INTERFACE_NET : 192.168.122.3/24
+NAMED_INTERFACE_IP : 192.168.122.2
+NAMED_INTERFACE_NET : 192.168.122.2/24
# how to run bind9
BIND9 : /usr/sbin/named