Enable wikidiff2 for FPM

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

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 3eda428c1041e75ff7019cef0abcefc796a9c3e2..aa19e91e29ec1e5c33d0112f3859d17888c91b93 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
 #
-# 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
 #
-#     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,
@@ -19,11 +19,26 @@
 
 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 "bind9" do
+service_name = if node[:lsb][:release].to_f < 20.04
+                 "bind9"
+               else
+                 "named"
+               end
+
+service service_name do
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
 end
 
 template "/etc/bind/named.conf.local" do
@@ -31,7 +46,7 @@ template "/etc/bind/named.conf.local" do
   owner "root"
   group "root"
   mode 0o644
-  notifies :restart, "service[bind9]"
+  notifies :restart, "service[#{service_name}]"
 end
 
 template "/etc/bind/named.conf.options" do
@@ -39,7 +54,8 @@ template "/etc/bind/named.conf.options" do
   owner "root"
   group "root"
   mode 0o644
-  notifies :restart, "service[bind9]"
+  variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
+  notifies :restart, "service[#{service_name}]"
 end
 
 template "/etc/bind/db.10" do
@@ -47,7 +63,7 @@ template "/etc/bind/db.10" do
   owner "root"
   group "root"
   mode 0o644
-  notifies :reload, "service[bind9]"
+  notifies :reload, "service[#{service_name}]"
 end
 
 firewall_rule "accept-dns-udp" do