diff options
author | Roy Sindre Norangshol <roy.sindre@norangshol.no> | 2014-04-12 00:48:26 +0200 |
---|---|---|
committer | Roy Sindre Norangshol <roy.sindre@norangshol.no> | 2014-04-12 01:27:00 +0200 |
commit | 223db182458b25cff38b2bf9d9bd9c2323c89587 (patch) | |
tree | c75b36369aee81856f462d0f0eede3b345baa1bb | |
parent | 5fae740119c0aa4c1811dda9e707c647a95f59fe (diff) |
Rename ::config::sec_a to ::config::sec_hostname as the value is the server's hostname.
-rwxr-xr-x | include/config.pm | 2 | ||||
-rwxr-xr-x | tools/create-shellconf.pl | 4 | ||||
-rwxr-xr-x | tools/make-first-zones.pl | 10 | ||||
-rwxr-xr-x | tools/make-missing-conf.pl | 4 | ||||
-rwxr-xr-x | tools/make-named.pl | 2 | ||||
-rwxr-xr-x | tools/make-reverse4-files.pl | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/config.pm b/include/config.pm index dbe1831..870f5a2 100755 --- a/include/config.pm +++ b/include/config.pm @@ -34,7 +34,7 @@ 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"; -our $sec_a = "tress90"; +our $sec_hostname = "tress90"; our $sec_ptr = "151.216.125.2"; our $sec_v6 = "2a02:ed02:125::2"; 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 ( <STDIN> ) 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; |