diff options
| -rwxr-xr-x | tools/make-first-zones.pl | 18 | ||||
| -rwxr-xr-x | tools/make-reverse4-files.pl | 10 |
2 files changed, 12 insertions, 16 deletions
diff --git a/tools/make-first-zones.pl b/tools/make-first-zones.pl index a0946cc..b869115 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -45,17 +45,15 @@ if ( not -f $zonefile ) 608400 ; expire 3600 ) ; minimum and default TTL - IN NS ns1.$tgname.gathering.org. - IN NS ns2.$tgname.gathering.org. + IN NS $pri_hostname.$tgname.gathering.org. + IN NS $sec_hostname.$tgname.gathering.org. -ns1 IN A $pri_v4 -ns1 IN AAAA $pri_v6 -ns2 IN A $sec_v4 -ns2 IN AAAA $sec_v6 $pri_hostname IN A $pri_v4 $pri_hostname IN AAAA $pri_v6 $sec_hostname IN A $sec_v4 $sec_hostname IN AAAA $sec_v6 +ns1 IN CNAME $pri_hostname.$tgname.gathering.org. +ns2 IN CNAME $sec_hostname.$tgname.gathering.org. ; Generated by make-all-config.sh on the bootstrapping/nms server. ; Will not be overwritten unless it is missing ;) @@ -99,15 +97,15 @@ if ( not -f $zonefile ) print IPV6ZONE <<"EOF"; ; autogenerated, and updated from dhcpd -- DO NOT TOUCH! \$TTL 3600 -@ IN SOA ns1.$tgname.gathering.org. abuse.gathering.org. ( +@ IN SOA $pri_hostname.$tgname.gathering.org. abuse.gathering.org. ( $serial; serial 3600 ; refresh 1800 ; retry 608400 ; expire 3600 ) ; minimum and default TTL - IN NS ns1.$tgname.gathering.org. - IN NS ns2.$tgname.gathering.org. + IN NS $pri_hostname.$tgname.gathering.org. + IN NS $sec_hostname.$tgname.gathering.org. ; WARNING! Do not edit this file directly! ; on the bootstrapping/nms server! @@ -115,9 +113,7 @@ if ( not -f $zonefile ) EOF my $ip_pri = new Net::IP( $pri_v6 ) or die ( "Error, new Net::IP for " . $pri_v6 ); my $ip_sec = new Net::IP( $sec_v6 ) or die ( "Error, new Net::IP for " . $sec_v6 ); - print IPV6ZONE $ip_pri->reverse_ip() . " IN PTR ns1.$tgname.gathering.org.\n"; print IPV6ZONE $ip_pri->reverse_ip() . " IN PTR $pri_hostname.$tgname.gathering.org.\n"; - print IPV6ZONE $ip_sec->reverse_ip() . " IN PTR ns2.$tgname.gathering.org.\n"; print IPV6ZONE $ip_sec->reverse_ip() . " IN PTR $sec_hostname.$tgname.gathering.org.\n"; close IPV6ZONE; } diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl index 2be6807..a47e93f 100755 --- a/tools/make-reverse4-files.pl +++ b/tools/make-reverse4-files.pl @@ -117,25 +117,25 @@ while (1) print ZFILE <<"EOF"; ; Base reverse zones are updated from dhcpd -- DO NOT TOUCH! \$TTL 3600 -@ IN SOA ns1.$tgname.gathering.org. abuse.gathering.org. ( +@ IN SOA $pri_hostname.$tgname.gathering.org. abuse.gathering.org. ( $serial ; serial 3600 ; refresh 1800 ; retry 608400 ; expire 3600 ) ; minimum and default TTL - IN NS ns1.$tgname.gathering.org. - IN NS ns2.$tgname.gathering.org. + IN NS $pri_hostname.$tgname.gathering.org. + IN NS $sec_hostname.$tgname.gathering.org. \$ORIGIN $rev_zone. EOF if ( ($pt_oct == $t_oct) && ($ps_oct == $s_oct) ) { - print ZFILE $pf_oct . " IN PTR ns1.$tgname.gathering.org.\n"; + print ZFILE $pf_oct . " IN PTR $pri_hostname.$tgname.gathering.org.\n"; } if ( ($st_oct == $t_oct) && ($ss_oct == $s_oct) ) { - print ZFILE $sf_oct . " IN PTR ns2.$tgname.gathering.org.\n"; + print ZFILE $sf_oct . " IN PTR $sec_hostname.$tgname.gathering.org.\n"; } } else |