diff options
| author | Jon Langseth <jon.langseth@gmail.com> | 2014-04-12 01:55:21 +0200 |
|---|---|---|
| committer | Jon Langseth <jon.langseth@gmail.com> | 2014-04-12 01:55:21 +0200 |
| commit | 6652c802cd34a52e8533bf55f827301cd228faac (patch) | |
| tree | a38b754852761eb7c5e2b76ba71f3871c0fb35de /tools/make-named.pl | |
| parent | 373ece550a9959e31d41f4548e12e653a887e9a6 (diff) | |
| parent | 3c192a61c526b497856c22c2ece0b2f6572393da (diff) | |
Merge pull request #4 from norrs/config_variables_renames
Config variables renames from norrs
Diffstat (limited to 'tools/make-named.pl')
| -rwxr-xr-x | tools/make-named.pl | 14 |
1 files changed, 7 insertions, 7 deletions
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; |