Changeset 516 for trunk/DNSDB.pm

Timestamp:

05/24/13 16:58:49 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Tune up location/view handling on zone add. See #10.

Domains and revzones added with a location specified will actually use
that location. Documentation note: Zones specifying a location on
creation will only be visible to that location, because the SOA record
will be created with that location. A zone should be created with no
location set if records must be visible across multiple locations, or
publicly.

File:

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

trunk/DNSDB.pm

@@ -1811 +1811 @@
   my $state = shift;
   return ('FAIL',"Domain status must be specified\n") if !defined($state);
+  my $defloc = shift || '';
 
   $state = 1 if $state =~ /^active$/;
@@ -1838 +1839 @@
   eval {
     # insert the domain...
-    $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
+    $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,?,?)", undef,
+        ($domain, $group, $state, $defloc));
 
     # get the ID...
@@ -1849 +1851 @@
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
-    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl)".
-        " VALUES ($dom_id,?,?,?,?,?,?,?)");
+    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl,location)".
+        " VALUES ($dom_id,?,?,?,?,?,?,?,?)");
     $sth->execute($group);
-    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
+    while (my ($host, $type, $val, $dist, $weight, $port, $ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
       $val =~ s/DOMAIN/$domain/g;
-      $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
+      $sth_in->execute($host, $type, $val, $dist, $weight, $port, $ttl, $defloc);
       if ($typemap{$type} eq 'SOA') {
         my @tmp1 = split /:/, $host;