X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32b54ca58c5a7f03aff4d6390fbd6481e72685ae..15a6ed4cd248aeb1c47ddc349ce6cc2172bf8489:/cookbooks/mysql/recipes/default.rb

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index b35eff8f9..427081239 100644
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -22,15 +22,21 @@ package "mysql-client"
 
 service "mysql" do
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
+  supports :status => true, :restart => true
 end
 
-template "/etc/mysql/conf.d/chef.cnf" do
+conf_file = if node[:lsb][:release].to_f >= 16.04
+              "/etc/mysql/mysql.conf.d/zzz-chef.cnf"
+            else
+              "/etc/mysql/conf.d/zzz-chef.cnf"
+            end
+
+template conf_file do
   source "my.cnf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :reload, "service[mysql]"
+  mode 0o644
+  notifies :restart, "service[mysql]"
 end
 
 package "libdbd-mysql-perl"