diff --git a/.gitignore b/.gitignore index a4f7972..9a18c77 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ db* /slave/ffa.zone /zones.rfc1918 +/icvpn.conf #ausser... !named.conf diff --git a/ffhh.conf b/ffhh.conf index d76cdab..0a2fec1 100644 --- a/ffhh.conf +++ b/ffhh.conf @@ -82,6 +82,3 @@ zone "d.0.d.f.2.b.b.2.1.5.d.f.ip6.arpa" IN { allow-update { key srv01-zone-key.; }; }; -include "/etc/bind/forward-zones.conf"; -include "/etc/bind/mirror-zones.conf"; - diff --git a/forward-zones.conf b/forward-zones.conf deleted file mode 100644 index ba40755..0000000 --- a/forward-zones.conf +++ /dev/null @@ -1,50 +0,0 @@ -## Freifunk Augsburg -zone "ffa" in { - type forward; - forwarders { 10.11.10.15; 10.11.0.8; }; -}; - -#DN42 -zone "dn42" { - type forward; - forwarders { 172.22.0.53; }; -}; -zone "22.172.in-addr.arpa" { - type forward; - forwarders { 172.22.0.53; }; -}; -zone "23.172.in-addr.arpa" { - type forward; - forwarders { 172.22.0.53; }; -}; - -zone "hack" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -zone "31.172.in-addr.arpa" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -zone "100.10.in-addr.arpa" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -zone "101.10.in-addr.arpa" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -zone "102.10.in-addr.arpa" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -zone "103.10.in-addr.arpa" IN { - type static-stub; - server-addresses { 172.31.0.5; }; -}; -//Freifunk Chemnitz .ffc -zone "ffc" in { - type forward; - forwarders { 10.8.6.6; }; -}; - diff --git a/mirror-zones.conf b/mirror-zones.conf deleted file mode 100644 index 2043e87..0000000 --- a/mirror-zones.conf +++ /dev/null @@ -1,18 +0,0 @@ -#Freifunk Luebeck -zone "ffhl" IN { - type slave; - file "/etc/bind/slave/db.ffhl"; - masters { fdef:ffc0:3dd7::a01; fdef:ffc0:3dd7::c01; fdef:ffc0:3dd7::e01; 10.130.10.1; 10.130.12.1; 10.130.14.1; }; - allow-transfer { any; }; - forwarders { }; -}; - -#Freifunk Kiel -zone "ffki" IN { - type slave; - file "/etc/bind/slave/db.ffki"; - masters { fda1:384a:74de:4242::1; fda1:384a:74de:4242::2; }; - allow-transfer { any; }; - forwarders { }; -}; - diff --git a/named.conf b/named.conf index 511c24b..670c02c 100644 --- a/named.conf +++ b/named.conf @@ -10,3 +10,4 @@ include "/etc/bind/named.conf.options"; include "/etc/bind/named.conf.local"; include "/etc/bind/named.conf.default-zones"; include "/etc/bind/ffhh.conf"; +include "/etc/bind/icvpn.conf";