From cab773896c9d58eef52411acd3715490abdc392b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 24 Nov 2009 08:40:58 +0000 Subject: Drop unused fake-102 bind branch. Use default-zones. --- bind/named.conf.local | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'bind/named.conf.local') diff --git a/bind/named.conf.local b/bind/named.conf.local index b2306ae..966382d 100644 --- a/bind/named.conf.local +++ b/bind/named.conf.local @@ -1,9 +1,7 @@ include "/etc/local-JONES.DK/bind/named.conf.acl"; - -view "222" { +view "internal" { match-clients { 127.0.0.0/24; 192.168.222.0/24; }; - include "/etc/local-COMMON/bind/named_BASE.conf"; include "/etc/local-JONES.DK/bind/named.conf.fake-222"; include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK"; @@ -11,26 +9,14 @@ view "222" { include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK"; include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK"; + include "/etc/bind/named.conf.default-zones"; }; - -view "internal" { - match-clients { 192.168.102.0/24; 192.168.101.0/24; }; - - include "/etc/local-COMMON/bind/named_BASE.conf"; - include "/etc/local-JONES.DK/bind/named.conf.fake-102"; - - include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK"; - include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK"; - include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK"; - include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK"; - -}; - view "external" { match-clients { any; }; recursion no; - include "/etc/local-COMMON/bind/named_BASE.conf"; + include "/etc/bind/zones.rfc1918"; + include "/etc/local-JONES.DK/bind/named.conf.pri"; include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK"; @@ -38,5 +24,5 @@ view "external" { include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK"; include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK"; - include "/etc/bind/zones.rfc1918"; + include "/etc/bind/named.conf.default-zones"; }; -- cgit v1.2.3