tilecache: use conditional validation upstream

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

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index 427081239daa786675442735ee1adbdc881ae64d..bbbca3c616cfd6c91c2262dd19c47f5487c2a22c 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: mysql
+# Cookbook:: mysql

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # 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
 
   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"
   source "my.cnf.erb"
   owner "root"
   group "root"


@@ -42,7 +36,7 @@ end
 package "libdbd-mysql-perl"
 package "libcache-cache-perl"
 
 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
   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


@@ -50,15 +44,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
   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
 
   munin_plugin "mysql_#{stat}" do
     target "mysql_"
   end
 end
 

-%w(
+%w[

   bin_relay_log files_tables replication
   bin_relay_log files_tables replication

-).each do |stat|
+].each do |stat|

   munin_plugin "mysql_#{stat}" do
     action :delete
   end
   munin_plugin "mysql_#{stat}" do
     action :delete
   end