Merge pull request #46 from gcmalloc/master

Adding a forward option for a zone.

Modulefile

@@ -6,3 +6,4 @@ author 'Adam Jahn'
 project_page 'https://github.com/ajjahn/puppet-dns'
 source 'https://github.com/ajjahn/puppet-dns'
 dependency 'puppetlabs/concat', '>=1.0.0'
+dependency 'puppetlabs/stdlib', '>= 2.4.0'

README.md

@@ -83,6 +83,16 @@ Tweak and add the following to your site manifest:
       }
     }
 
+You can also declare forwarders for a specific zone, if you don't have one in the dns::option.
+
+      dns::zone { 'example.com':
+        soa             => "ns1.example.com",
+        soa_email       => 'admin.example.com',
+        allow_forwarder => ['8.8.8.8'],
+        forward_policy  => 'first'
+        nameservers     => ["ns1"]
+      }
+
 ### Exported resource patterns
     node default {
       # Other nodes export an A record for thier hostname

manifests/zone.pp

@@ -11,12 +11,22 @@
   $reverse = false,
   $zone_type = 'master',
   $allow_transfer = [],
+  $allow_forwarder = [],
+  $forward_policy = 'first',
   $slave_masters = undef,
   $zone_notify = false,
   $ensure = present
 ) {
 
   validate_array($allow_transfer)
+  validate_array($allow_forwarder)
+  if $dns::options::forwarder and $allow_forwarder {
+    fatal("You cannot specify a global forwarder and \
+    a zone forwarder for zone ${soa}")
+  }
+  if !member(['first', 'only'], $forward_policy) {
+    error('The forward policy can only be set to either first or only')
+  }
 
   $zone_serial = $serial ? {
     false   => inline_template('<%= Time.now.to_i %>'),

spec/defines/dns_zone_spec.rb

@@ -15,7 +15,9 @@
   context 'passing an array to data' do
     let :facts do { :concat_basedir => '/dne',  } end
     let :params do
-      { :allow_transfer => [ '192.0.2.0', '2001:db8::/32' ] }
+      { :allow_transfer => [ '192.0.2.0', '2001:db8::/32' ],
+        :allow_forwarder => ['8.8.8.8', '208.67.222.222']
+      }
     end
 
     it 'should pass input validation' do
@@ -31,12 +33,53 @@
       should contain_concat__fragment('named.conf.local.test.com.include').
       with_content(/192\.0\.2\.0/)
     }
+
+    it {
+      should contain_concat__fragment('named.conf.local.test.com.include').
+      with_content(/forwarders/)
+    }
+
+    it {
+      should contain_concat__fragment('named.conf.local.test.com.include').
+      with_content(/forward first;/)
+    }
+
+    it {
+      should contain_concat__fragment('named.conf.local.test.com.include').
+      with_content(/8.8.8.8/)
+    }
+
     it {
       should contain_concat__fragment('named.conf.local.test.com.include').
       with_content(/2001:db8::\/32/)
     }
+  end
 
+  context 'when ask to have a only forward policy' do
+    let :facts do { :concat_basedir => '/dne',  } end
+    let :params do
+      { :allow_transfer => [],
+        :allow_forwarder => ['8.8.8.8', '208.67.222.222'],
+        :forward_policy => 'only'
+      }
+    end
+      it 'should have a forward only policy' do
+          should contain_concat__fragment('named.conf.local.test.com.include').
+          with_content(/forward only;/)
+      end
   end
 
+  context 'In the default case with no explicit forward policy or forwarder' do
+    let :facts do { :concat_basedir => '/dne',  } end
+    let :params do
+      { :allow_transfer => [ '192.0.2.0', '2001:db8::/32' ],
+      }
+    end
+
+    it 'should not have any forwarder configuration' do
+        should_not contain_concat__fragment('named.conf.local.test.com.include').
+        with_content(/forward/)
+    end
+  end
 end
 

templates/zone.erb

@@ -13,6 +13,14 @@ zone "<%= @zone %>" {
   <%= ip %>;
 <% end -%>
   };
-<% end -%>  
+<% end -%>
+<% if !@allow_forwarder.empty? -%>
+  forward <%= @forward_policy %>;
+  forwarders {
+<% @allow_forwarder.each do |ip| -%>
+  <%= ip %>;
+<% end -%>
+  };
+<% end -%>
 <% end -%>
 };