nominatim: remove some dead config options

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

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 519b9c8236ea41d7b4d501d29bbaddd8d0b07997..78db7466f5a3e8e5c3794060cc66228138c41f02 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: bind
+# Cookbook:: bind

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,35 +19,45 @@
 
 include_recipe "networking"
 
 
 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"
 
 package "bind9"
 

-service "bind9" do
+service "named" do

   action [:enable, :start]
   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"
 end
 
 template "/etc/bind/named.conf.local" do
   source "named.local.erb"
   owner "root"
   group "root"

-  mode 0644
-  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"
 end
 
 template "/etc/bind/named.conf.options" do
   source "named.options.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, "service[bind9]"
+  mode "644"
+  variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
+  notifies :restart, "service[named]"

 end
 
 template "/etc/bind/db.10" do
   source "db.10.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/bind/db.10" do
   source "db.10.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :reload, "service[bind9]"
+  mode "644"
+  notifies :reload, "service[named]"

 end
 
 firewall_rule "accept-dns-udp" do
 end
 
 firewall_rule "accept-dns-udp" do