Changeset 11595 for trunk

Timestamp:

11/09/08 16:36:51 (2 months ago)

Author:

ejhernandez@…

Message:

Applied patch from Víctor Jímenez to add an IP address for the domain optionally. Thanks very much for your addition!

Location:

trunk/client/dns

Files:

• src/EBox/DNS.pm.in (modified) (4 diffs)
• src/EBox/Model/DomainTable.pm (modified) (3 diffs)
• stubs/db.mas (modified) (2 diffs)

trunk/client/dns/src/EBox/DNS.pm.in

@@ -219 +219 @@
 #
 #           name - String the domain's name
+#           ipaddr - String the domain's ip address
 #
 sub domains
@@ -232 +233 @@
 
         $domaindata->{'name'} = $row->valueByName('domain');
+        $domaindata->{'ipaddr'} = $row->valueByName('ipaddr');
 
         push(@array, $domaindata);
@@ -453 +455 @@
 #
 #  'name': domain name
+#  'ipaddr': domain ip address
 #  'hosts': an array ref returned by <EBox::DNS::_hostnames> method.
 #
@@ -463 +466 @@
     my $row = $model->find(domain => $domain->{'name'});
     $domdata->{'name'} = $domain->{'name'};
+    $domdata->{'ipaddr'} = $domain->{'ipaddr'};
     $domdata->{'hosts'} = $self->_hostnames(
             $row->subModel('hostnames')->rows());

trunk/client/dns/src/EBox/Model/DomainTable.pm

@@ -15 +15 @@
 
 # Class:
-# 
+#
 #   EBox::DNS::Model::DomainTable
 #
-#   This class inherits from <EBox::Model::DataTable> and represents the
-#   object table which basically contains domains names and a reference
-#   to a member <EBox::DNS::Model::HostnameTable>
+#   This class inherits from <EBox::Model::DataTable> and represents
+#   the object table which basically contains domains names, the IP
+#   address for the domain and a reference to a member
+#   <EBox::DNS::Model::HostnameTable>
 #
-#   
 package EBox::DNS::Model::DomainTable;
 
@@ -33 +33 @@
 use EBox::Types::DomainName;
 use EBox::Types::HasMany;
+use EBox::Types::HostIP;
 use EBox::Sudo;
 
@@ -85 +86 @@
                                 'backView' => '/ebox/DNS/View/DomainTable',
                              ),
+            new EBox::Types::HostIP
+                            (
+                                'fieldName' => 'ipaddr',
+                                'printableName' => __('IP Address'),
+                                'size' => '20',
+                                'optional' => 1,
+                                'editable' => 1
+                            ),
           );
 

trunk/client/dns/stubs/db.mas

@@ -7 +7 @@
 
       name - String the domain's name
+      ipaddr - String the domain's ip address
       hosts - Array ref containing hash refs with the following elements:
          ip   - String the IP address for that host
@@ -37 +38 @@
                 NS      <% $nameserverHostname %>.<% $domain{'name'} %>.        ;nameserver
 ;
+% if($domain{'ipaddr'}) {       
+                A       <% $domain{'ipaddr'} %>
+% }
 % unless (@hosts > 0 and (scalar(grep { $_->{'name'} eq $nameserverHostname } @hosts))) {
 <% $nameserverHostname %>               A       127.0.0.1