aboutsummaryrefslogtreecommitdiffstats
path: root/tools/make-named.pl
diff options
context:
space:
mode:
Diffstat (limited to 'tools/make-named.pl')
-rwxr-xr-xtools/make-named.pl73
1 files changed, 23 insertions, 50 deletions
diff --git a/tools/make-named.pl b/tools/make-named.pl
index 575d584..a9ea02d 100755
--- a/tools/make-named.pl
+++ b/tools/make-named.pl
@@ -30,37 +30,10 @@ my $named_file = $bind_base . "named.conf";
if ( -f $named_file )
{
- print STDERR $named_file . " already exists. Cowardly refusing to continue\n";
+ print STDERR $named_file . " already exists. Cowardly refusing to continue.\n";
exit;
}
-my $tgname = $nms::config::tgname;
-
-my $pri_hostname = $nms::config::pri_hostname;
-my $pri_v4 = $nms::config::pri_v4;
-my $pri_v6 = $nms::config::pri_v6;
-
-my $sec_hostname = $nms::config::sec_hostname;
-my $sec_v4 = $nms::config::sec_v4;
-my $sec_v6 = $nms::config::sec_v6;
-my $ipv6zone = $nms::config::ipv6zone;
-my $ext_xfer = $nms::config::ext_xfer;
-my $ext_ns = $nms::config::ext_ns;
-
-my $ddns_key = $nms::config::ddns_key;
-
-my $base_ipv4net = $nms::config::base_ipv4net;
-my $base_ipv4prefix = $nms::config::base_ipv4prefix;
-
-my $base_ipv6net = $nms::config::base_ipv6net;
-my $base_ipv6prefix = $nms::config::base_ipv6prefix;
-
-my $noc_nett = $nms::config::noc_nett;
-
-my $ddns_to = $nms::config::ddns_to;
-
-my $pxe_server = $nms::config::ddns_to;
-
my $run = `date +%Y%m%d-%H%M`;
open NFILE, ">" . $named_file or die ( $! . " " . $named_file );
@@ -69,9 +42,9 @@ chomp $run;
print NFILE <<EOF;
// This named.conf was generated by make-named.pl at $run
// The current version of make-named.pl should not overwrite this file.
-acl tg-nett { $base_ipv4net/$base_ipv4prefix; $base_ipv6net:/$base_ipv6prefix; 127.0.0.0/8; ::1; };
-acl ns-xfr { $ext_ns; $sec_v4; $sec_v6; $pri_v4; $pri_v6; $noc_nett; };
-acl ripe-xfr { $ext_ns; $sec_v4; $sec_v6; $pri_v4; $pri_v6; $ext_xfer; };
+acl tg-nett { $nms::config::base_ipv4net; $nms::config::base_ipv6net; $nms::config::extra_net; 127.0.0.0/8; ::1; };
+acl ns-xfr { $nms::config::sec_v4; $nms::config::sec_v6; $nms::config::pri_v4; $nms::config::pri_v6; $nms::config::noc_nett; };
+acl ext-xfr { $nms::config::ext_xfer; };
options {
directory "/etc/bind";
@@ -85,7 +58,7 @@ options {
key DHCP_UPDATER {
algorithm HMAC-MD5.SIG-ALG.REG.INT;
- secret $ddns_key;
+ secret $nms::config::ddns_key;
};
EOF
@@ -93,26 +66,26 @@ if ( $role eq "master" )
{
print NFILE <<EOF;
-zone "$tgname.gathering.org" {
+zone "$nms::config::tgname.gathering.org" {
type master;
- file "$tgname.gathering.org.zone";
+ file "$nms::config::tgname.gathering.org.zone";
notify yes;
allow-transfer { ns-xfr; };
};
-zone "infra.$tgname.gathering.org" {
+zone "infra.$nms::config::tgname.gathering.org" {
type master;
- file "infra.$tgname.gathering.org.zone";
+ file "infra.$nms::config::tgname.gathering.org.zone";
notify yes;
allow-transfer { ns-xfr; };
};
-zone "$ipv6zone" {
+zone "$nms::config::ipv6zone" {
type master;
allow-update { key DHCP_UPDATER; };
notify yes;
- file "$ipv6zone.zone";
- allow-transfer { ns-xfr; ripe-xfr; };
+ file "$nms::config::ipv6zone.zone";
+ allow-transfer { ns-xfr; ext-xfr; };
};
include "/etc/bind/named.conf.default-zones";
@@ -125,28 +98,28 @@ if ( $role eq "slave" )
{
print NFILE <<EOF;
-masters bootstrap { $pri_v4; };
+masters master_ns { $nms::config::pri_v6; $nms::config::pri_v4; };
-zone "$tgname.gathering.org" {
+zone "$nms::config::tgname.gathering.org" {
type slave;
- file "slave/$tgname.gathering.org";
+ file "slave/$nms::config::tgname.gathering.org";
notify no;
- masters { bootstrap; };
+ masters { master_ns; };
};
-zone "infra.$tgname.gathering.org" {
+zone "infra.$nms::config::tgname.gathering.org" {
type slave;
- file "slave/infra.$tgname.gathering.org";
+ file "slave/infra.$nms::config::tgname.gathering.org";
notify no;
- masters { bootstrap; };
+ masters { master_ns; };
};
-zone "$ipv6zone" {
+zone "$nms::config::ipv6zone" {
type slave;
notify no;
- masters { bootstrap; };
- file "slave/$ipv6zone:";
- allow-transfer { ns-xfr; ripe-xfr; };
+ masters { master_ns; };
+ file "slave/$nms::config::ipv6zone:";
+ allow-transfer { ns-xfr; ext-xfr; };
};
include "named.conf.default-zones";