From 3c192a61c526b497856c22c2ece0b2f6572393da Mon Sep 17 00:00:00 2001
From: Roy Sindre Norangshol <roy.sindre@norangshol.no>
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 <<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_ptr; $sec_v6; $pri_v4; $pri_v6; $noc_nett; };
-acl ripe-xfr { $ext_ns; $sec_ptr; $sec_v6; $pri_v4; $pri_v6; $ext_xfer; };
+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; };
 
 options {
         directory "/etc/bind";
diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl
index c9dabce..2be6807 100755
--- a/tools/make-reverse4-files.pl
+++ b/tools/make-reverse4-files.pl
@@ -45,7 +45,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;
@@ -70,7 +70,7 @@ my ( $p_oct, $s_oct, $t_oct ) = ( $1, $2, $3 );
 
 $pri_v4 =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+).*/;
 my ( $pp_oct, $ps_oct, $pt_oct, $pf_oct) = ( $1, $2, $3, $4 );
-$sec_ptr =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+).*/;
+$sec_v4 =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+).*/;
 my ( $sp_oct, $ss_oct, $st_oct, $sf_oct) = ( $1, $2, $3, $4 );
 
 if ( $role eq "master" )
@@ -106,7 +106,7 @@ while (1)
 		print NFILE "    type master;\n";
 		print NFILE "    allow-update { key DHCP_UPDATER; };\n";
 		print NFILE "    notify yes;\n";
-		print NFILE "    allow-transfer { $sec_ptr; $ext_xfer; $noc_nett; $noc_nett_v6; };\n";
+		print NFILE "    allow-transfer { $sec_v4; $ext_xfer; $noc_nett; $noc_nett_v6; };\n";
 		print NFILE "    file \"reverse/". $rev_zone .".zone\";\n";
 		print NFILE "};\n\n";
 
-- 
cgit v1.2.3