diff options
| -rwxr-xr-x | include/config.pm | 2 | ||||
| -rwxr-xr-x | tools/create-shellconf.pl | 4 | ||||
| -rwxr-xr-x | tools/dlink-ng2dns.pl | 2 | ||||
| -rwxr-xr-x | tools/generate-dnsrr.pl | 2 | ||||
| -rwxr-xr-x | tools/make-dhcpd.pl | 4 | ||||
| -rwxr-xr-x | tools/make-first-zones.pl | 6 | ||||
| -rwxr-xr-x | tools/make-missing-conf.pl | 2 | ||||
| -rwxr-xr-x | tools/make-named.pl | 8 | ||||
| -rwxr-xr-x | tools/make-reverse4-files.pl | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/include/config.pm b/include/config.pm index 870f5a2..130f8ea 100755 --- a/include/config.pm +++ b/include/config.pm @@ -31,7 +31,7 @@ our $dlink1g_passwd = '<removed>'; our $tgname = "tg13"; our $pri_hostname = "winix"; -our $pri_ptr = "151.216.126.2"; +our $pri_v4 = "151.216.126.2"; our $pri_v6 = "2a02:ed02:126::2"; our $pri_net = "151.216.126.0/24"; our $sec_hostname = "tress90"; 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 (<STDIN>) { 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 (<STDIN>) { 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 <<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_ptr; $pri_v6; $noc_nett; }; -acl ripe-xfr { $ext_ns; $sec_ptr; $sec_v6; $pri_ptr; $pri_v6; $ext_xfer; }; +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; }; options { directory "/etc/bind"; @@ -125,7 +125,7 @@ if ( $role eq "slave" ) { print NFILE <<EOF; -masters bootstrap { $pri_ptr; }; +masters bootstrap { $pri_v4; }; zone "$tgname.gathering.org" { type slave; diff --git a/tools/make-reverse4-files.pl b/tools/make-reverse4-files.pl index ca55b50..c9dabce 100755 --- a/tools/make-reverse4-files.pl +++ b/tools/make-reverse4-files.pl @@ -41,7 +41,7 @@ my $bind_sec_revzones_file = $bind_base . "named.slave-reverse4.conf"; 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; @@ -68,7 +68,7 @@ my $base_ipv4 = new Net::IP( $base_ipv4net . "/" . $base_ipv4prefix ); $base_ipv4net =~ m/^(\d+)\.(\d+)\.(\d+)\..*/; my ( $p_oct, $s_oct, $t_oct ) = ( $1, $2, $3 ); -$pri_ptr =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+).*/; +$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+).*/; my ( $sp_oct, $ss_oct, $st_oct, $sf_oct) = ( $1, $2, $3, $4 ); |