diff options
| -rwxr-xr-x | clients/ipv6-dns.pl | 2 | ||||
| -rwxr-xr-x | include/config.pm | 10 | ||||
| -rwxr-xr-x | tools/create-shellconf.pl | 16 | ||||
| -rwxr-xr-x | tools/dlink-ng2dns.pl | 2 | ||||
| -rwxr-xr-x | tools/generate-dnsrr.pl | 2 | ||||
| -rwxr-xr-x | tools/make-dhcpd.pl | 6 | ||||
| -rwxr-xr-x | tools/make-first-zones.pl | 32 | ||||
| -rwxr-xr-x | tools/make-missing-conf.pl | 14 | ||||
| -rwxr-xr-x | tools/make-named.pl | 14 | ||||
| -rwxr-xr-x | tools/make-reverse4-files.pl | 14 |
10 files changed, 56 insertions, 56 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..0ff44fb 100755 --- a/include/config.pm +++ b/include/config.pm @@ -30,12 +30,12 @@ our $dlink1g_passwd = '<removed>'; our $tgname = "tg13"; -our $pri_a = "winix"; -our $pri_ptr = "151.216.126.2"; +our $pri_hostname = "winix"; +our $pri_v4 = "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_ptr = "151.216.125.2"; +our $sec_hostname = "tress90"; +our $sec_v4 = "151.216.125.2"; our $sec_v6 = "2a02:ed02:125::2"; # for RIPE to get reverse zones via DNS AXFR @@ -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..d7abdab 100755 --- a/tools/create-shellconf.pl +++ b/tools/create-shellconf.pl @@ -15,12 +15,12 @@ my $shellconf_file = "include/tgmanage.cfg.sh"; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_hostname = $nms::config::pri_hostname; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_hostname = $nms::config::sec_hostname; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ddns_key = $nms::config::ddns_key; @@ -38,11 +38,11 @@ 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 "SECONDARY=\"$sec_a.$tgname.gathering.org\"\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 "SEC_PTR=\"$sec_ptr\"\n\n"; +print CFG "PRI_V4=\"$pri_v4\"\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/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..3a5db21 100755 --- a/tools/make-dhcpd.pl +++ b/tools/make-dhcpd.pl @@ -21,9 +21,9 @@ 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 $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_ptr, $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 1227129..a0946cc 100755 --- a/tools/make-first-zones.pl +++ b/tools/make-first-zones.pl @@ -15,11 +15,11 @@ $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_ptr = $nms::config::pri_ptr; +my $pri_hostname = $nms::config::pri_hostname; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_hostname = $nms::config::sec_hostname; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ipv6zone = $nms::config::ipv6zone; @@ -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 @@ -48,14 +48,14 @@ 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 A $sec_v4 ns2 IN AAAA $sec_v6 -$pri_a IN A $pri_ptr -$pri_a IN AAAA $pri_v6 -$sec_a IN A $sec_ptr -$sec_a IN AAAA $sec_v6 +$pri_hostname IN A $pri_v4 +$pri_hostname IN AAAA $pri_v6 +$sec_hostname IN A $sec_v4 +$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 ;) @@ -73,15 +73,15 @@ 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 $sec_a.$tgname.gathering.org. + IN NS $pri_hostname.$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 ;) @@ -116,9 +116,9 @@ 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"; + 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 f0fb0a0..345f29a 100755 --- a/tools/make-missing-conf.pl +++ b/tools/make-missing-conf.pl @@ -43,12 +43,12 @@ my $bind_conf_slave = $bind_base . "conf-slave/"; my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_hostname = $nms::config::pri_hostname; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_hostname = $nms::config::sec_hostname; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ext_xfer = $nms::config::ext_xfer; @@ -139,15 +139,15 @@ 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 $sec_a.$tgname.gathering.org. + IN NS $pri_hostname.$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 7e543e1..575d584 100755 --- a/tools/make-named.pl +++ b/tools/make-named.pl @@ -36,12 +36,12 @@ if ( -f $named_file ) my $tgname = $nms::config::tgname; -my $pri_a = $nms::config::pri_a; -my $pri_ptr = $nms::config::pri_ptr; +my $pri_hostname = $nms::config::pri_hostname; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_hostname = $nms::config::sec_hostname; +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_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_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"; @@ -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 d20ea37..2be6807 100755 --- a/tools/make-reverse4-files.pl +++ b/tools/make-reverse4-files.pl @@ -40,12 +40,12 @@ 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_ptr = $nms::config::pri_ptr; +my $pri_hostname = $nms::config::pri_hostname; +my $pri_v4 = $nms::config::pri_v4; my $pri_v6 = $nms::config::pri_v6; -my $sec_a = $nms::config::sec_a; -my $sec_ptr = $nms::config::sec_ptr; +my $sec_hostname = $nms::config::sec_hostname; +my $sec_v4 = $nms::config::sec_v4; my $sec_v6 = $nms::config::sec_v6; my $ext_xfer = $nms::config::ext_xfer; @@ -68,9 +68,9 @@ 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+).*/; +$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"; |