Changeset 901 for trunk/DNSDB.pm

Timestamp:

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

Author:

Kris Deugau

Message:

/trunk

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

File:

• trunk/DNSDB.pm (modified) (3 diffs)

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;