Changeset 870

Timestamp:

09/28/22 15:56:15 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 22 of many many

• Refine/tighten reverse zone export order
• Note zone<->location relationship for future need
• Forcibly include 'common' location in locations list
• Minor cleanup for correctness in BIND configuration fragment

File:

• trunk/DNSDB/ExportBIND.pm (modified) (5 diffs)

trunk/DNSDB/ExportBIND.pm

@@ -43 +43 @@
   # Fetch active zone list
   my $revsth = $dnsdb->{dbh}->prepare("SELECT rdns_id,revnet,status,changed,default_location FROM revzones WHERE status=1 ".
-        "ORDER BY masklen(revnet) DESC, rdns_id");
+        "ORDER BY masklen(revnet),revnet DESC, rdns_id");
   # Unflag changed zones, so we can maybe cache the export and not redo everything every time
   my $zonesth = $dnsdb->{dbh}->prepare("UPDATE revzones SET changed='n' WHERE rdns_id=?");
@@ -105 +105 @@
           open $zonefiles{$loc}, ">", $zfilepath;
           printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $arpazone, $loc, scalar(localtime)
-            or die "Error writing SOA [$zone, '$loc']: $!\n";;
-        }
+            or die "Error writing header [$zone, '$loc']: $!\n";;
+          # tag the zonefile for publication in the view
+          push @{$viewzones{$loc}}, $arpazone;
+        } # foreach @loclist
 
         # need to fetch this separately since the rest of the records all (should) have real IPs in val
@@ -198 +200 @@
     open BINDCONF, ">", $tmpconf;
 
-    foreach my $view (@{$viewlist}) {
+    foreach my $view (@{$viewlist}, 'common') {
 #print Dumper($view);
       print BINDCONF "view $view->{location} {\n";
@@ -207 +209 @@
       # same as a BIND view with match-clients { any; };
       if ($view->{iplist}) {
-         print BINDCONF "  match-clients { ".join("; ", $view->iplist)."; };\n";
+         print BINDCONF "  match-clients { ".join("; ", $view->{iplist})."; };\n";
 #         print "  match-clients { ".join("; ", split(/[\s,]+/, $view->{iplist}))."; };\n";
       } else {
@@ -217 +219 @@
         print qq(  zone "$zone" IN {\n\ttype master;\n\tnotify no;\n\tfile "db.$zone";\n  };\n);
       }
+      print BINDCONF "};\n\n";
       print "};\n\n";
     } # foreach @$viewlist