From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Aug 2021 17:37:08 +0000 (+0100)
Subject: Drop some conditional support for Ubuntu 18.04
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/8b9c58cf740bd7a78b85590e4c845a776df030be?ds=sidebyside

Drop some conditional support for Ubuntu 18.04
---

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 77c777e1a..78db7466f 100644
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -31,13 +31,7 @@ end.flatten
 
 package "bind9"
 
-service_name = if node[:lsb][:release].to_f < 20.04
-                 "bind9"
-               else
-                 "named"
-               end
-
-service service_name do
+service "named" do
   action [:enable, :start]
 end
 
@@ -46,7 +40,7 @@ template "/etc/bind/named.conf.local" do
   owner "root"
   group "root"
   mode "644"
-  notifies :restart, "service[#{service_name}]"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/named.conf.options" do
@@ -55,7 +49,7 @@ template "/etc/bind/named.conf.options" do
   group "root"
   mode "644"
   variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
-  notifies :restart, "service[#{service_name}]"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/db.10" do
@@ -63,7 +57,7 @@ template "/etc/bind/db.10" do
   owner "root"
   group "root"
   mode "644"
-  notifies :reload, "service[#{service_name}]"
+  notifies :reload, "service[named]"
 end
 
 firewall_rule "accept-dns-udp" do
diff --git a/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb
index ccce26093..f7a620810 100644
--- a/cookbooks/php/attributes/default.rb
+++ b/cookbooks/php/attributes/default.rb
@@ -1,7 +1,2 @@
-default[:php][:version] = if node[:lsb][:release].to_f < 20.04
-                            "7.2"
-                          else
-                            "7.4"
-                          end
-
+default[:php][:version] = "7.4"
 default[:php][:fpm][:options] = {}