X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=config%2Fmake-named.pl;h=2099b647769483f55edb4de7993213bb4dc60a12;hb=7db7efc71093253f508ce90f2d793215cb958432;hp=e8d8780a1e1202313902bbf05d686b47b2862a7e;hpb=aac78bf951fa0993e93eb93b268ad738d6b01a46;p=nms

diff --git a/config/make-named.pl b/config/make-named.pl
index e8d8780..2099b64 100755
--- a/config/make-named.pl
+++ b/config/make-named.pl
@@ -9,7 +9,7 @@ open NAMES, "switches.txt"
 or die "switches.txt: $!";
 while (<NAMES>) {
 	chomp;
-	/81\.162\.(\d+\.\d+)\s+(\d+)\s+(\S+)/ or next;
+	/194\.0\.(\d+\.\d+)\s+(\d+)\s+(\S+)/ or next;
 	$netmasks{$1} = $2;
 	$netnames{$1} = $3;
 	push @nets, $1;
@@ -21,12 +21,12 @@ print <<"EOF";
 options {
         directory "/etc/bind";
 	allow-query { any; };
-	allow-transfer { 194.19.3.20; 81.162.254.76; }; 
+	allow-transfer { 194.19.3.20; 194.0.255.2; }; 
 	auth-nxdomain no;
 	recursion yes;
 
-	forwarders { 194.19.2.11; 194.19.3.11; }; 
-	forward only;
+//	forwarders { 194.19.2.11; 194.19.3.11; }; 
+//	forward only;
 };
 
 zone "." { type hint; file "db.root"; };
@@ -37,71 +37,54 @@ zone "0.0.127.in-addr.arpa" {
 	notify no;
 };
 
-zone "tg05.gathering.org" {
+zone "tg06.gathering.org" {
 	type master;
-	file "tg05.gathering.org";
+	file "tg06.gathering.org";
 	notify yes;
-	allow-transfer { 81.162.254.76; };
-};
-zone "www.gathering.org" {
-	type master;
-	file "www.gathering.org";
-	notify yes;
-	allow-transfer { 81.162.254.76; };
+	allow-transfer { 194.0.255.2; };
 };
 
 // serversubnett
-zone "254.162.81.in-addr.arpa" {
+zone "255.0.194.in-addr.arpa" {
 	type master;
-	file "254.162.81.in-addr.arpa";
+	file "255.0.194.in-addr.arpa";
 	notify yes;
-	allow-transfer { 81.162.254.76; 193.0.0.0/22; };
+	allow-transfer { 194.0.255.2; 193.0.0.0/22; };
 };
 
-zone "162.81.in-addr.arpa" {
+zone "0.194.in-addr.arpa" {
 	type master;
 	allow-update { key DHCP_UPDATER; };
 	notify yes;
-	file "dynamic/162.81.in-addr.arpa";	
-	allow-transfer { 194.19.3.20; 81.162.254.76; 193.0.0.0/22; };
+	file "dynamic/0.194.in-addr.arpa";	
+	allow-transfer { 194.19.3.20; 194.0.255.2; 193.0.0.0/22; };
 };
 
 key DHCP_UPDATER {
 	algorithm HMAC-MD5.SIG-ALG.REG.INT;
-	secret removed;
+	secret 5Yz1azvh7mE0IRGffTvtKg==;
 };
 
 EOF
 
 for my $net (@nets) {
 	my $domain = $netnames{$net};
-
-       my ($netmask, $numpc);
-       if ($netmasks{$net} == 24) {
-	       $netmask = "255.255.255.0";
-	       $numpc = 256;
-       } elsif ($netmasks{$net} == 25) {
-	       $netmask = "255.255.255.128";
-	       $numpc = 128;
-       } elsif ($netmasks{$net} == 26) {
-	       $netmask = "255.255.255.192";
-	       $numpc = 64;
-       } else {
-	       die "Unknown netmask /$netmasks{$net}";
-       }
-
-       $net =~ /(\d+)\.(\d+)/ or die "Unknown net $net";
-       my ($majorsubnet,$minorsubnet) = ($1,$2);
-
-	my $gw = "82.162.$majorsubnet." . ($minorsubnet + 1);
-
-	print <<"EOF";
-zone "$domain.tg05.gathering.org" {
+	my @domains;
+	if ($domain =~ /^split:(.*)/) {
+		@domains = split /,/, $1;
+	} else {
+		@domains = ($domain);
+	}
+
+	for my $d (@domains) {
+		print <<"EOF";
+zone "$d.tg06.gathering.org" {
 	type master;
 	allow-update { key DHCP_UPDATER; };
 	notify yes;
-	file "dynamic/$domain.tg05.gathering.org";
-	allow-transfer { 194.19.3.20; 81.162.254.76; };
+	file "dynamic/$d.tg06.gathering.org";
+	allow-transfer { 194.19.3.20; 194.0.255.2; };
 };
 EOF
+	}
 }