From 35392722739e0c288786f35b49d9c0799c86321f Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 3 Jul 2020 11:40:44 +0100
Subject: [PATCH] Fix bind cookbook for change in service name on Ubuntu 20.04

---
 cookbooks/bind/recipes/default.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 087ef5802..aa19e91e2 100644
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -31,9 +31,14 @@ 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
@@ -41,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
@@ -50,7 +55,7 @@ template "/etc/bind/named.conf.options" do
   group "root"
   mode 0o644
   variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
-  notifies :restart, "service[bind9]"
+  notifies :restart, "service[#{service_name}]"
 end
 
 template "/etc/bind/db.10" do
@@ -58,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
-- 
2.39.5