X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/969e1e6d277ef40a24d2cdc33f31f1eaa48752f5..1bc8da5f3a3bfd6c3f0ba374f12d489d13831460:/cookbooks/bind/recipes/default.rb diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb index 6c596420d..39f0ba2fd 100644 --- a/cookbooks/bind/recipes/default.rb +++ b/cookbooks/bind/recipes/default.rb @@ -17,18 +17,6 @@ # 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 @@ -48,7 +36,6 @@ template "/etc/bind/named.conf.options" do owner "root" group "root" mode "644" - variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients notifies :restart, "service[named]" end @@ -62,16 +49,14 @@ end 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 - source "net" - dest "fw" - proto "tcp" + context :incoming + protocol :tcp dest_ports "domain" end