Drop CGIMAP_OAUTH_HOST setting

[chef.git] / cookbooks / bind / recipes / default.rb

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 8c7ee11e790c92863a49939bab4738be4a763cc0..39f0ba2fddb1753170f151395c009272f748fdd6 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -17,18 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "networking"
-
-clients = search(:node, "roles:#{node[:bind][:clients]}")
-
-ipv4_clients = clients.collect do |client|
-  client.ipaddresses(:family => :inet)
-end.flatten
-
-ipv6_clients = clients.collect do |client|
-  client.ipaddresses(:family => :inet6)
-end.flatten
-

 package "bind9"
 
 service "named" do
 package "bind9"
 
 service "named" do


@@ -48,7 +36,6 @@ template "/etc/bind/named.conf.options" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients

   notifies :restart, "service[named]"
 end
 
   notifies :restart, "service[named]"
 end
 


@@ -62,16 +49,14 @@ end
 
 firewall_rule "accept-dns-udp" do
   action :accept
 
 firewall_rule "accept-dns-udp" do
   action :accept

-  source "net"
-  dest "fw"
-  proto "udp"
+  context :incoming
+  protocol :udp

   dest_ports "domain"
 end
 
 firewall_rule "accept-dns-tcp" do
   action :accept
   dest_ports "domain"
 end
 
 firewall_rule "accept-dns-tcp" do
   action :accept

-  source "net"
-  dest "fw"
-  proto "tcp:syn"
+  context :incoming
+  protocol :tcp

   dest_ports "domain"
 end
   dest_ports "domain"
 end