X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d9ce053b71c151916fa8764b44a6058f827d3146..4848413b102b4643b0dbec409f0a45dd83cfc07f:/cookbooks/bind/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index aaba99781..78db7466f 100644
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -19,39 +19,45 @@
 
 include_recipe "networking"
 
-ipv4_clients = []
-ipv6_clients = []
+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 "bind9" do
+service "named" do
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
 end
 
 template "/etc/bind/named.conf.local" do
   source "named.local.erb"
   owner "root"
   group "root"
-  mode 0o644
-  notifies :restart, "service[bind9]"
+  mode "644"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/named.conf.options" do
   source "named.options.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
   variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
-  notifies :restart, "service[bind9]"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/db.10" do
   source "db.10.erb"
   owner "root"
   group "root"
-  mode 0o644
-  notifies :reload, "service[bind9]"
+  mode "644"
+  notifies :reload, "service[named]"
 end
 
 firewall_rule "accept-dns-udp" do