Merge pull request crowbar#52 from ociuhandu/pull-req-release-pebbles…

…-master-58a2078e8676eb14d4439f36e1ad3e1385f0a21b crowbar#52 Merged by devtool for VictorLowther
jesa1 · Aug 27, 2013 · 4e6b32a · 4e6b32a
2 parents b060ac6 + 8bd641f
commit 4e6b32a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/chef/cookbooks/bind9/recipes/default.rb b/chef/cookbooks/bind9/recipes/default.rb
@@ -33,7 +33,7 @@
 
 directory "/etc/bind"
 
-node[:dns][:zone_files]=Array.new
+node.set[:dns][:zone_files]=Array.new
 
 def populate_soa_defaults(zone)
   [ :admin,

diff --git a/chef/cookbooks/resolver/recipes/default.rb b/chef/cookbooks/resolver/recipes/default.rb
@@ -30,10 +30,12 @@
 
 dns_list << node[:dns][:nameservers]
 
-template "/etc/resolv.conf" do
-  source "resolv.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  variables(:nameservers => dns_list.flatten, :search => node[:dns][:domain])
+unless node[:platform] == "windows"
+  template "/etc/resolv.conf" do
+    source "resolv.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables(:nameservers => dns_list.flatten, :search => node[:dns][:domain])
+  end
 end