Disable virtual host support for squid 3 caches

[chef.git] / cookbooks / mysql / recipes / default.rb

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index b35eff8f9e9a99e01b09e0e449746ecc216a37e9..ffe699d85638a573012f2fb683741c251bf33d05 100644 (file)
--- 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,
@@ -22,21 +22,27 @@ 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"
 package "libcache-cache-perl"
 
-%w(
+%w[
   commands connections files handler_read handler_tmp handler_transaction
   handler_write innodb_bpool innodb_bpool_act innodb_history_list_length
   innodb_insert_buf innodb_io innodb_io_pend innodb_log innodb_queries
@@ -44,15 +50,15 @@ package "libcache-cache-perl"
   innodb_tnx max_mem mrr myisam_indexes network_traffic performance
   qcache qcache_mem select_types slow sorts table_definitions table_locks
   tmp_tables
-).each do |stat|
+].each do |stat|
   munin_plugin "mysql_#{stat}" do
     target "mysql_"
   end
 end
 
-%w(
+%w[
   bin_relay_log files_tables replication
-).each do |stat|
+].each do |stat|
   munin_plugin "mysql_#{stat}" do
     action :delete
   end