X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/90a349e0bc558441e65156eabb585c578d93fbfd..28dcd029516a658143374e35dba3db3760dbb55b:/cookbooks/mysql/recipes/default.rb diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb index 9c35682fd..5cedc301f 100644 --- a/cookbooks/mysql/recipes/default.rb +++ b/cookbooks/mysql/recipes/default.rb @@ -8,7 +8,7 @@ # 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, @@ -25,13 +25,7 @@ service "mysql" do supports :status => true, :restart => true end -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 +template "/etc/mysql/mysql.conf.d/zzz-chef.cnf" do source "my.cnf.erb" owner "root" group "root"