Changeset 901

Timestamp:

08/11/25 16:34:14 (3 hours ago)

Author:

Kris Deugau

Message:

/trunk

Unravel the BIND export options, make them a consistent group, and scrap
extras that aren't used

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• DNSDB/ExportBIND.pm (modified) (3 diffs)
• dnsdb.conf (modified) (1 diff)

trunk/DNSDB.pm

@@ -205 +205 @@
 
                 # BIND-style zone export
+                bind_export_conf_path   => 'zones.conf',
                 # should arguably inherit something from BIND defaults for /var/named?
-                bind_export_zone_path   => 'zones/',
-                bind_export_conf_path   => 'zones.conf',
-                bind_export_shortlines  => 0,
+                bind_export_zone_path   => 'zones/db.%zone',
+                # just in case someone wants reverse zones separate from forward zones
+                bind_export_zone_path   => 'zones/db.%zone',
+                bind_export_fqdn        => 1,
                 bind_export_autoexpire_ttl      => 15,
 
@@ -261 +263 @@
   # Several settings are booleans.  Handle multiple possible ways of setting them.
   for my $boolopt ('log_failures', 'force_refresh', 'lowercase', 'usecache',
-        'bind_export_shortlines', 'template_skip_0', 'template_skip_255', 'autotxt') {
+        'bind_export_fqdn', 'template_skip_0', 'template_skip_255', 'autotxt') {
     if ($self->{$boolopt} ne '1' && $self->{$boolopt} ne '0') {
       # true/false, on/off, yes/no all valid.
@@ -2214 +2216 @@
       $cfg->{bind_export_conf_path}   = $1 if m{^bind_export_conf_path\s*=\s*([a-z0-9/_.%-]+)}i;
       $cfg->{bind_export_zone_path}   = $1 if m{^bind_export_zone_path\s*=\s*([a-z0-9/_.%-]+)}i;
-      $cfg->{bind_export_shortlines}  = $1 if /^bind_export_shortlines\s*=\s*([a-z01]+)/i;
+      $cfg->{bind_export_reverse_zone_path}     = $1 if m{^bind_export_reverse_zone_path\s*=\s*([a-z0-9/_.%-]+)}i;
+      $cfg->{bind_export_fqdn}  = $1 if /^bind_export_fqdn\s*=\s*([a-z01]+)/i;
       $cfg->{bind_export_autoexpire_ttl} = $1 if /^bind_export_autoexpire_ttl\s*=\s*(\d+)/;
       $cfg->{force_refresh}     = $1 if /^force_refresh\s*=\s*([a-z01]+)/i;

trunk/DNSDB/ExportBIND.pm

@@ -4 +4 @@
 ##
 # $Id$
-# Copyright 2022,2023 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2022-2025 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -419 +419 @@
   # at figuring out which zones are visible/present in which views
   if ($viewlist) {
-    my $tmpconf = "$dnsdb->{bind_zone_conf}.$$"; ##fixme:  split filename for prefixing
+    my $tmpconf = "$dnsdb->{bind_export_conf_path}.$$"; ##fixme:  split filename for prefixing
     open BINDCONF, ">", $tmpconf;
 
@@ -445 +445 @@
 #      print "};\n\n";
     } # foreach @$viewlist
-    rename $tmpconf, $dnsdb->{bind_zone_conf};
+    rename $tmpconf, $dnsdb->{bind_export_conf_path};
   } # if $viewlist
 

trunk/dnsdb.conf

@@ -29 +29 @@
 
 ## BIND export options
-# config fragment populated by exports from dnsadmin
-#bind_zone_conf = /var/named/zones.conf
-# forward zone path
+# Config fragment populated by exports from dnsadmin
+#bind_export_zone_conf = /var/named/zones.conf
+# Forward zone file path template
 #bind_export_zone_path = /var/named/zones/%view/db.%zone
-# because they're fish of a different colour
-#bind_export_reverse_zone_path = /var/named/zones/%view/db.%arpazone
-# export all hostnames as full dot-terminated FQDNs?
+# Reverse zone file path template
+#bind_export_reverse_zone_path = /var/named/zones/%view/db.%zone
+# Export all hostnames as full dot-terminated FQDNs?
 #bind_export_fqdn = 1
 # Short TTL for "autoexpiry" of records.  Values between 1 and 10 or so may