Drop some conditional support for Ubuntu 18.04

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 77c777e1a19e05d27babf440798f58e8639a8417..78db7466f5a3e8e5c3794060cc66228138c41f02 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -31,13 +31,7 @@ end.flatten
 
 package "bind9"
 
 
 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
 
   action [:enable, :start]
 end
 


@@ -46,7 +40,7 @@ template "/etc/bind/named.conf.local" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  notifies :restart, "service[#{service_name}]"
+  notifies :restart, "service[named]"

 end
 
 template "/etc/bind/named.conf.options" do
 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
   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
 end
 
 template "/etc/bind/db.10" do


@@ -63,7 +57,7 @@ template "/etc/bind/db.10" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  notifies :reload, "service[#{service_name}]"
+  notifies :reload, "service[named]"

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

diff --git a/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb
index ccce260930be9ef6775deeb573fc2c92ccfa36f4..f7a6208104e0bb1253008918129bdfd77cbd86b7 100644 (file)
--- 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] = {}
 default[:php][:fpm][:options] = {}