Changeset 446

Timestamp:

01/04/13 17:06:46 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fine-tune new reverse zone process to support setting a default
location.
Also make sure that an initial new location will be created as a
two-character alphabetic ID, since we're being paranoid about what
tinydns will accept for these.

Location:

trunk

Files:

• DNSDB.pm (modified) (8 diffs)
• dns.cgi (modified) (2 diffs)
• templates/newrevzone.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -1979 +1979 @@
   my $dbh = shift;
   my $zone = NetAddr::IP->new(shift);
+
   return ('FAIL',"Zone name must be a valid CIDR netblock") unless ($zone && $zone->addr !~ /^0/);
   my $revpatt = shift;  # construct a custom (A/AAAA+)? PTR template record
   my $group = shift;
   my $state = shift;
+  my $defloc = shift || '';
 
   $state = 1 if $state =~ /^active$/;
@@ -2007 +2009 @@
   # Wrap all the SQL in a transaction
   eval {
-    # insert the domain...
-    $dbh->do("INSERT INTO revzones (revnet,group_id,status) VALUES (?,?,?)", undef, ($zone, $group, $state));
+    # insert the zone...
+    $dbh->do("INSERT INTO revzones (revnet,group_id,status,default_location) VALUES (?,?,?,?)", undef,
+        ($zone, $group, $state, $defloc) );
 
     # get the ID...
@@ -2018 +2021 @@
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,ttl FROM default_rev_records WHERE group_id=?");
-    my $sth_in = $dbh->prepare("INSERT INTO records (rdns_id,domain_id,host,type,val,ttl)".
-        " VALUES ($rdns_id,?,?,?,?,?)");
+    my $sth_in = $dbh->prepare("INSERT INTO records (rdns_id,domain_id,host,type,val,ttl,location)".
+        " VALUES ($rdns_id,?,?,?,?,?,?)");
     $sth->execute($group);
     while (my ($host,$type,$val,$ttl) = $sth->fetchrow_array()) {
@@ -2073 +2076 @@
       }
 
-      $sth_in->execute($domid,$host,$type,$val,$ttl);
+      $sth_in->execute($domid,$host,$type,$val,$ttl,$defloc);
 
       if ($typemap{$type} eq 'SOA') {
@@ -2083 +2086 @@
         $defttl = $tmp2[3];
       } else {
-        my $logentry = "[new $zone] Added record '$host $typemap{$type}";
-        _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
-                entry => $logentry." $val', TTL $ttl"));
+        my $logentry = "[new $zone] Added record '$host $typemap{$type} $val', TTL $ttl";
+        $logentry .= ", default location ".getLoc($dbh, $defloc)->{description} if $defloc;
+        _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group, entry => $logentry) );
       }
     }
@@ -2105 +2108 @@
       }
 
-      $sth_in->execute($domid,$host,$type,$val,$defttl);
+      $sth_in->execute($domid,$host,$type,$val,$defttl,$defloc);
       my $logentry = "[new $zone] Added record '$host $typemap{$type}";
       _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
@@ -3041 +3044 @@
     ($loc) = ($loc =~ /^(..)/);
     my $origloc = $loc;
+    $loc = 'aa' if !$loc;       
     # Make a change...
     $loc++;
@@ -3252 +3256 @@
 
   my @loclist;
-  push @loclist, { locname => "(None/public)", loc => '', selected => ($sel ? 0 : ($sel eq '' ? 1 : 0)) };
+  push @loclist, { locname => "(Default/All)", loc => '', selected => ($sel ? 0 : ($sel eq '' ? 1 : 0)) };
   while (my ($locname, $loc) = $sth->fetchrow_array) {
     my %row = (

trunk/dns.cgi

@@ -449 +449 @@
 
   fill_grouplist("grouplist");
+  my $loclist = getLocDropdown($dbh, $curgroup);
+  $page->param(loclist => $loclist);
 
   # prepopulate revpatt with the matching default record
@@ -473 +475 @@
 
   my ($code,$msg) = addRDNS($dbh, $webvar{revzone}, $webvar{revpatt}, $webvar{group},
-        ($webvar{makeactive} eq 'on' ? 1 : 0));
+        ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{location});
 
   if ($code eq 'OK') {

trunk/templates/newrevzone.tmpl

@@ -28 +28 @@
         </tr>
         <tr class="datalinelight">
+                <td>Default location/view:</td>
+                <td align="left">
+                        <select name="location">
+                        <TMPL_LOOP loclist>
+                        <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected</TMPL_IF>><TMPL_VAR NAME=locname></option>
+                        </TMPL_LOOP>
+                        </select>
+                </td>
+        </tr>
+        <tr class="datalinelight">
                 <td>Add reverse zone to group:</td>
                 <td><select name="group">