Rename ::config::pri_a to ::config::pri_hostname as the value is the server's hostname.

7 files changed, 17 insertions, 17 deletions

diff --git a/clients/ipv6-dns.pl b/clients/ipv6-dns.pl
index d965acc..24b8bfb 100755
--- a/clients/ipv6-dns.pl
+++ b/clients/ipv6-dns.pl
@@ -17,7 +17,7 @@ BEGIN {
 my $dbh = nms::db_connect() or die "Can't connect to database";
 my $res = Net::DNS::Resolver->new;
 
-$res->nameservers("$nms::config::pri_a.$nms::config::tgname.gathering.org");
+$res->nameservers("$nms::config::pri_hostname.$nms::config::tgname.gathering.org");
 
 my $kname = 'DHCP_UPDATER';
 
diff --git a/include/config.pm b/include/config.pm
index e6bbcb2..dbe1831 100755
--- a/include/config.pm
+++ b/include/config.pm
@@ -30,7 +30,7 @@ our $dlink1g_passwd = '<removed>';
 
 our $tgname    = "tg13";
 
-our $pri_a     = "winix";
+our $pri_hostname     = "winix";
 our $pri_ptr   = "151.216.126.2";
 our $pri_v6    = "2a02:ed02:126::2";
 our $pri_net   = "151.216.126.0/24";
@@ -97,4 +97,4 @@ our @distrobox_ips = (
 # Forwarding zones.
 our @forwarding_zones = qw( );
 
-1;
\ No newline at end of file
+1;
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 ( <STDIN> )
 		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;