From 5fae740119c0aa4c1811dda9e707c647a95f59fe Mon Sep 17 00:00:00 2001 From: Roy Sindre Norangshol Date: Sat, 12 Apr 2014 00:45:18 +0200 Subject: Rename ::config::pri_a to ::config::pri_hostname as the value is the server's hostname. --- tools/create-shellconf.pl | 4 ++-- tools/make-first-zones.pl | 14 +++++++------- tools/make-missing-conf.pl | 6 +++--- tools/make-named.pl | 2 +- tools/make-reverse4-files.pl | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/create-shellconf.pl b/tools/create-shellconf.pl index 8e2582d..f9007f3 100755 --- a/tools/create-shellconf.pl +++ b/tools/create-shellconf.pl @@ -15,7 +15,7 @@ my $shellconf_file = "include/tgmanage.cfg.sh"; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; +my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; @@ -38,7 +38,7 @@ print CFG "# using data from nms::config.\n"; print CFG "#\n"; print CFG "# Do you need new common/configuration variables?\n"; print CFG "# Add/update include/config.local.pm and tools/create-shellconf.pl\n\n"; -print CFG "PRIMARY=\"$pri_a.$tgname.gathering.org\"\n"; +print CFG "PRIMARY=\"$pri_hostname.$tgname.gathering.org\"\n"; print CFG "SECONDARY=\"$sec_a.$tgname.gathering.org\"\n"; print CFG "TGNAME=\"$tgname\"\n\n"; print CFG "PRI_PTR=\"$pri_ptr\"\n"; diff --git a/tools/make-first-zones.pl b/tools/make-first-zones.pl index 1227129..b36dc1a 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -15,7 +15,7 @@ $base = $ARGV[0] if $#ARGV > -1; $base .= "/" if not $base =~ m/\/$/ and not $base eq ""; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; +my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; my $sec_a = $nms::config::sec_a; @@ -38,7 +38,7 @@ if ( not -f $zonefile ) print MAINZONE <<"EOF"; \$TTL 3600 -@ IN SOA $pri_a.$tgname.gathering.org. abuse.gathering.org. ( +@ IN SOA $pri_hostname.$tgname.gathering.org. abuse.gathering.org. ( $serial; serial 3600 ; refresh 1800 ; retry @@ -52,8 +52,8 @@ ns1 IN A $pri_ptr ns1 IN AAAA $pri_v6 ns2 IN A $sec_ptr ns2 IN AAAA $sec_v6 -$pri_a IN A $pri_ptr -$pri_a IN AAAA $pri_v6 +$pri_hostname IN A $pri_ptr +$pri_hostname IN AAAA $pri_v6 $sec_a IN A $sec_ptr $sec_a IN AAAA $sec_v6 @@ -73,14 +73,14 @@ if ( not -f $zonefile ) print MAINZONE <<"EOF"; \$TTL 3600 -@ IN SOA $pri_a.$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 $pri_a.$tgname.gathering.org. + IN NS $pri_hostname.$tgname.gathering.org. IN NS $sec_a.$tgname.gathering.org. ; Generated by make-all-config.sh on the bootstrapping/nms server. @@ -116,7 +116,7 @@ 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_a.$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_a.$tgname.gathering.org.\n"; close IPV6ZONE; diff --git a/tools/make-missing-conf.pl b/tools/make-missing-conf.pl index f0fb0a0..326a978 100755 --- a/tools/make-missing-conf.pl +++ b/tools/make-missing-conf.pl @@ -43,7 +43,7 @@ my $bind_conf_slave = $bind_base . "conf-slave/"; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; +my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; @@ -139,14 +139,14 @@ while ( ) print ZFILE << "EOF"; ; Base reverse zones are updated from dhcpd -- DO NOT TOUCH! \$TTL 3600 -@ IN SOA $pri_a.$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 $pri_a.$tgname.gathering.org. + IN NS $pri_hostname.$tgname.gathering.org. IN NS $sec_a.$tgname.gathering.org. \$ORIGIN $name.$tgname.gathering.org. EOF diff --git a/tools/make-named.pl b/tools/make-named.pl index 7e543e1..dc8611e 100755 --- a/tools/make-named.pl +++ b/tools/make-named.pl @@ -36,7 +36,7 @@ if ( -f $named_file ) my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; +my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl index d20ea37..071b86b 100755 --- a/tools/make-reverse4-files.pl +++ b/tools/make-reverse4-files.pl @@ -40,7 +40,7 @@ my $bind_sec_revzones_file = $bind_base . "named.slave-reverse4.conf"; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; +my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -- cgit v1.2.3 From 223db182458b25cff38b2bf9d9bd9c2323c89587 Mon Sep 17 00:00:00 2001 From: Roy Sindre Norangshol Date: Sat, 12 Apr 2014 00:48:26 +0200 Subject: Rename ::config::sec_a to ::config::sec_hostname as the value is the server's hostname. --- tools/create-shellconf.pl | 4 ++-- tools/make-first-zones.pl | 10 +++++----- tools/make-missing-conf.pl | 4 ++-- tools/make-named.pl | 2 +- tools/make-reverse4-files.pl | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tools') diff --git a/tools/create-shellconf.pl b/tools/create-shellconf.pl index f9007f3..bea4184 100755 --- a/tools/create-shellconf.pl +++ b/tools/create-shellconf.pl @@ -19,7 +19,7 @@ my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; +my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; my $sec_v6 = $nms::config::sec_v6; @@ -39,7 +39,7 @@ print CFG "#\n"; print CFG "# Do you need new common/configuration variables?\n"; print CFG "# Add/update include/config.local.pm and tools/create-shellconf.pl\n\n"; print CFG "PRIMARY=\"$pri_hostname.$tgname.gathering.org\"\n"; -print CFG "SECONDARY=\"$sec_a.$tgname.gathering.org\"\n"; +print CFG "SECONDARY=\"$sec_hostname.$tgname.gathering.org\"\n"; print CFG "TGNAME=\"$tgname\"\n\n"; print CFG "PRI_PTR=\"$pri_ptr\"\n"; print CFG "SEC_PTR=\"$sec_ptr\"\n\n"; diff --git a/tools/make-first-zones.pl b/tools/make-first-zones.pl index b36dc1a..4ed683c 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -18,7 +18,7 @@ my $tgname = $nms::config::tgname; my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; +my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; my $sec_v6 = $nms::config::sec_v6; my $ipv6zone = $nms::config::ipv6zone; @@ -54,8 +54,8 @@ ns2 IN A $sec_ptr ns2 IN AAAA $sec_v6 $pri_hostname IN A $pri_ptr $pri_hostname IN AAAA $pri_v6 -$sec_a IN A $sec_ptr -$sec_a IN AAAA $sec_v6 +$sec_hostname IN A $sec_ptr +$sec_hostname IN AAAA $sec_v6 ; Generated by make-all-config.sh on the bootstrapping/nms server. ; Will not be overwritten unless it is missing ;) @@ -81,7 +81,7 @@ if ( not -f $zonefile ) 3600 ) ; minimum and default TTL IN NS $pri_hostname.$tgname.gathering.org. - IN NS $sec_a.$tgname.gathering.org. + IN NS $sec_hostname.$tgname.gathering.org. ; Generated by make-all-config.sh on the bootstrapping/nms server. ; Will not be overwritten unless it is missing ;) @@ -118,7 +118,7 @@ EOF 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_a.$tgname.gathering.org.\n"; + print IPV6ZONE $ip_sec->reverse_ip() . " IN PTR $sec_hostname.$tgname.gathering.org.\n"; close IPV6ZONE; } else { print "Skipped v6-reverse-zone, file exists.\n"; } diff --git a/tools/make-missing-conf.pl b/tools/make-missing-conf.pl index 326a978..3c4a05f 100755 --- a/tools/make-missing-conf.pl +++ b/tools/make-missing-conf.pl @@ -47,7 +47,7 @@ my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; +my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; my $sec_v6 = $nms::config::sec_v6; @@ -147,7 +147,7 @@ while ( ) 3600 ) ; minimum and default TTL IN NS $pri_hostname.$tgname.gathering.org. - IN NS $sec_a.$tgname.gathering.org. + IN NS $sec_hostname.$tgname.gathering.org. \$ORIGIN $name.$tgname.gathering.org. EOF close ZFILE; diff --git a/tools/make-named.pl b/tools/make-named.pl index dc8611e..fbabf8c 100755 --- a/tools/make-named.pl +++ b/tools/make-named.pl @@ -40,7 +40,7 @@ my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; +my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; my $sec_v6 = $nms::config::sec_v6; my $ipv6zone = $nms::config::ipv6zone; diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl index 071b86b..ca55b50 100755 --- a/tools/make-reverse4-files.pl +++ b/tools/make-reverse4-files.pl @@ -44,7 +44,7 @@ my $pri_hostname = $nms::config::pri_hostname; my $pri_ptr = $nms::config::pri_ptr; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; +my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; my $sec_v6 = $nms::config::sec_v6; -- cgit v1.2.3 From 89ff78867ca90dbbc51df1e070290bd7da985755 Mon Sep 17 00:00:00 2001 From: Roy Sindre Norangshol Date: Sat, 12 Apr 2014 01:05:44 +0200 Subject: Rename ::config::pri_ptr to ::config::pri_v4 as the value is the NS primary IPv4 address. --- tools/create-shellconf.pl | 4 ++-- tools/dlink-ng2dns.pl | 2 +- tools/generate-dnsrr.pl | 2 +- tools/make-dhcpd.pl | 4 ++-- tools/make-first-zones.pl | 6 +++--- tools/make-missing-conf.pl | 2 +- tools/make-named.pl | 8 ++++---- tools/make-reverse4-files.pl | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tools') diff --git a/tools/create-shellconf.pl b/tools/create-shellconf.pl index bea4184..ae60166 100755 --- a/tools/create-shellconf.pl +++ b/tools/create-shellconf.pl @@ -16,7 +16,7 @@ my $shellconf_file = "include/tgmanage.cfg.sh"; my $tgname = $nms::config::tgname; my $pri_hostname = $nms::config::pri_hostname; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; @@ -41,7 +41,7 @@ print CFG "# Add/update include/config.local.pm and tools/create-shellconf.pl\n\ print CFG "PRIMARY=\"$pri_hostname.$tgname.gathering.org\"\n"; print CFG "SECONDARY=\"$sec_hostname.$tgname.gathering.org\"\n"; print CFG "TGNAME=\"$tgname\"\n\n"; -print CFG "PRI_PTR=\"$pri_ptr\"\n"; +print CFG "PRI_V4=\"$pri_v4\"\n"; print CFG "SEC_PTR=\"$sec_ptr\"\n\n"; print CFG "DDNS_KEY=\"$ddns_key\"\n\n"; print CFG "BASEV4=\"$base_ipv4net\"\n"; diff --git a/tools/dlink-ng2dns.pl b/tools/dlink-ng2dns.pl index 2b6f965..a7e01a8 100755 --- a/tools/dlink-ng2dns.pl +++ b/tools/dlink-ng2dns.pl @@ -19,7 +19,7 @@ if (@ARGV > 0) { ) } -print "server $nms::config::pri_ptr\n"; +print "server $nms::config::pri_v4\n"; while () { diff --git a/tools/generate-dnsrr.pl b/tools/generate-dnsrr.pl index 789f268..e9c5afd 100755 --- a/tools/generate-dnsrr.pl +++ b/tools/generate-dnsrr.pl @@ -65,7 +65,7 @@ if ($nsupdate || $reverse){ $domain = "." . $domain if defined($domain); -print "server $nms::config::pri_ptr\n" if ($nsupdate || $reverse); +print "server $nms::config::pri_v4\n" if ($nsupdate || $reverse); while () { next if /^(#|\s+$)/; # skip if comment, or blank line diff --git a/tools/make-dhcpd.pl b/tools/make-dhcpd.pl index 2cf388a..66ef09d 100755 --- a/tools/make-dhcpd.pl +++ b/tools/make-dhcpd.pl @@ -21,7 +21,7 @@ my $dhcp_pxeconf = $dhcpd_base . "pxe-boot.conf"; my $dhcp_ciscoapconf = $dhcpd_base . "ciscowlc.conf"; my $tgname = $nms::config::tgname; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_v4 = $nms::config::pri_v4; my $pri_net = $nms::config::pri_net; my $sec_ptr = $nms::config::sec_ptr; my $pxe_server = $nms::config::pxe_server; @@ -47,7 +47,7 @@ if ( not -f $dhcpd_conf ) # # log-facility local7; option domain-name "$tgname.gathering.org"; -option domain-name-servers $pri_ptr, $sec_ptr; +option domain-name-servers $pri_v4, $sec_ptr; default-lease-time 3600; max-lease-time 7200; authoritative; diff --git a/tools/make-first-zones.pl b/tools/make-first-zones.pl index 4ed683c..9fe6f05 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -16,7 +16,7 @@ $base .= "/" if not $base =~ m/\/$/ and not $base eq ""; my $tgname = $nms::config::tgname; my $pri_hostname = $nms::config::pri_hostname; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; my $sec_ptr = $nms::config::sec_ptr; @@ -48,11 +48,11 @@ if ( not -f $zonefile ) IN NS ns1.$tgname.gathering.org. IN NS ns2.$tgname.gathering.org. -ns1 IN A $pri_ptr +ns1 IN A $pri_v4 ns1 IN AAAA $pri_v6 ns2 IN A $sec_ptr ns2 IN AAAA $sec_v6 -$pri_hostname IN A $pri_ptr +$pri_hostname IN A $pri_v4 $pri_hostname IN AAAA $pri_v6 $sec_hostname IN A $sec_ptr $sec_hostname IN AAAA $sec_v6 diff --git a/tools/make-missing-conf.pl b/tools/make-missing-conf.pl index 3c4a05f..9bd2583 100755 --- a/tools/make-missing-conf.pl +++ b/tools/make-missing-conf.pl @@ -44,7 +44,7 @@ my $bind_conf_slave = $bind_base . "conf-slave/"; my $tgname = $nms::config::tgname; my $pri_hostname = $nms::config::pri_hostname; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; diff --git a/tools/make-named.pl b/tools/make-named.pl index fbabf8c..b3ffa80 100755 --- a/tools/make-named.pl +++ b/tools/make-named.pl @@ -37,7 +37,7 @@ if ( -f $named_file ) my $tgname = $nms::config::tgname; my $pri_hostname = $nms::config::pri_hostname; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; @@ -70,8 +70,8 @@ print NFILE < Date: Sat, 12 Apr 2014 01:09:16 +0200 Subject: Rename ::config::sec_ptr to ::config::sec_v4 as the value is the NS secondary IPv4 address. --- tools/create-shellconf.pl | 4 ++-- tools/make-dhcpd.pl | 4 ++-- tools/make-first-zones.pl | 6 +++--- tools/make-missing-conf.pl | 2 +- tools/make-named.pl | 6 +++--- tools/make-reverse4-files.pl | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/create-shellconf.pl b/tools/create-shellconf.pl index ae60166..d7abdab 100755 --- a/tools/create-shellconf.pl +++ b/tools/create-shellconf.pl @@ -20,7 +20,7 @@ my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ddns_key = $nms::config::ddns_key; @@ -42,7 +42,7 @@ print CFG "PRIMARY=\"$pri_hostname.$tgname.gathering.org\"\n"; print CFG "SECONDARY=\"$sec_hostname.$tgname.gathering.org\"\n"; print CFG "TGNAME=\"$tgname\"\n\n"; print CFG "PRI_V4=\"$pri_v4\"\n"; -print CFG "SEC_PTR=\"$sec_ptr\"\n\n"; +print CFG "SEC_V4=\"$sec_v4\"\n\n"; print CFG "DDNS_KEY=\"$ddns_key\"\n\n"; print CFG "BASEV4=\"$base_ipv4net\"\n"; print CFG "PREFIXV4=\"$base_ipv4prefix\"\n"; diff --git a/tools/make-dhcpd.pl b/tools/make-dhcpd.pl index 66ef09d..3a5db21 100755 --- a/tools/make-dhcpd.pl +++ b/tools/make-dhcpd.pl @@ -23,7 +23,7 @@ my $dhcp_ciscoapconf = $dhcpd_base . "ciscowlc.conf"; my $tgname = $nms::config::tgname; my $pri_v4 = $nms::config::pri_v4; my $pri_net = $nms::config::pri_net; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_v4 = $nms::config::sec_v4; my $pxe_server = $nms::config::pxe_server; my $ddns_key = $nms::config::ddns_key; my $ciscowlc_a = $nms::config::ciscowlc_a; @@ -47,7 +47,7 @@ if ( not -f $dhcpd_conf ) # # log-facility local7; option domain-name "$tgname.gathering.org"; -option domain-name-servers $pri_v4, $sec_ptr; +option domain-name-servers $pri_v4, $sec_v4; default-lease-time 3600; max-lease-time 7200; authoritative; diff --git a/tools/make-first-zones.pl b/tools/make-first-zones.pl index 9fe6f05..a0946cc 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -19,7 +19,7 @@ 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_ptr = $nms::config::sec_ptr; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ipv6zone = $nms::config::ipv6zone; @@ -50,11 +50,11 @@ if ( not -f $zonefile ) ns1 IN A $pri_v4 ns1 IN AAAA $pri_v6 -ns2 IN A $sec_ptr +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_ptr +$sec_hostname IN A $sec_v4 $sec_hostname IN AAAA $sec_v6 ; Generated by make-all-config.sh on the bootstrapping/nms server. diff --git a/tools/make-missing-conf.pl b/tools/make-missing-conf.pl index 9bd2583..345f29a 100755 --- a/tools/make-missing-conf.pl +++ b/tools/make-missing-conf.pl @@ -48,7 +48,7 @@ my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ext_xfer = $nms::config::ext_xfer; diff --git a/tools/make-named.pl b/tools/make-named.pl index b3ffa80..575d584 100755 --- a/tools/make-named.pl +++ b/tools/make-named.pl @@ -41,7 +41,7 @@ my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; my $sec_hostname = $nms::config::sec_hostname; -my $sec_ptr = $nms::config::sec_ptr; +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; @@ -70,8 +70,8 @@ print NFILE <