Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310785

Change subject: templates: purge templates/mysql, unused
......................................................................

templates: purge templates/mysql, unused

Change-Id: Ia3d60a2d360f6e5174baae9f6d7cfe7913c663e2
---
D templates/mysql/generic_my.cnf.erb
1 file changed, 0 insertions(+), 172 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/310785/1

diff --git a/templates/mysql/generic_my.cnf.erb 
b/templates/mysql/generic_my.cnf.erb
deleted file mode 100644
index 07020fe..0000000
--- a/templates/mysql/generic_my.cnf.erb
+++ /dev/null
@@ -1,172 +0,0 @@
-###
-####    This file managed by puppet.
-###
-
-#
-# * IMPORTANT
-#   If you make changes to these settings and your system uses apparmor, you 
may
-#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-
-[mysqld]
-basedir                        = <%= @basedir                         %>
-datadir                        = <%= @datadir                         %>
-tmpdir                         = <%= @tmpdir                          %>
-socket                         = <%= @socket_path                     %>
-pid-file                       = <%= @pid_path                        %>
-user                           = mysql
-
-
-##############
-# Networking #
-##############
-
-bind_address                   = <%= @bind_address                    %>
-port                           = <%= @port                            %>
-skip_name_resolve
-max_allowed_packet             = <%= @max_allowed_packet              %>
-max_connections                = <%= @max_connections                 %>
-wait_timeout                   = <%= @wait_timeout                    %>
-connect_timeout                = <%= @connect_timeout                 %>
-
-
-###########
-# Logging #
-###########
-log_error                      = <%= @log_error                       %>
-
-<% if slow_query_log_file -%>
-slow_query_log                 = 1
-slow_query_log_file            = <%= @slow_query_log_file             %>
-long_query_time                = <%= @long_query_time                 %>
-<% end -%>
-
-# Character Set
-character_set_server           = utf8
-collation_server               = utf8_general_ci
-
-# Allow fulltext searches to find words smaller than 4 characters
-ft_min_word_len                = 3
-
-
-####################################
-# Buffers, Threads, Caches, Limits #
-####################################
-<%
-# every setting below is configurable
-# in puppet with the mysql_instance
-# define.  Defaults for these are
-# set in the mysql_instance define
--%>
-tmp_table_size                 = <%= @tmp_table_size                  %>
-max_heap_table_size            = <%= @max_heap_table_size             %>
-max_tmp_tables                 = <%= @max_tmp_tables                  %>
-
-join_buffer_size               = <%= @join_buffer_size                %>
-read_buffer_size               = <%= @read_buffer_size                %>
-sort_buffer_size               = <%= @sort_buffer_size                %>
-
-table_cache                    = <%= @table_cache                     %>
-table_definition_cache         = <%= @table_definition_cache          %>
-open_files_limit               = <%= @open_files_limit                %>
-
-thread_stack                   = <%= @thread_stack                    %>
-thread_cache_size              = <%= @thread_cache_size               %>
-thread_concurrency             = <%= @thread_concurrency              %>
-
-query_cache_size               = <%= @query_cache_size                %>
-query_cache_limit              = <%= @query_cache_limit               %>
-tmp_table_size                 = <%= @tmp_table_size                  %>
-read_rnd_buffer_size           = <%= @read_rnd_buffer_size            %>
-
-###################
-# MyISAM Settings #
-###################
-key_buffer_size                = <%= @key_buffer_size                 %>
-myisam_sort_buffer_size        = <%= @myisam_sort_buffer_size         %>
-myisam_max_sort_file_size      = <%= @myisam_max_sort_file_size       %>
-
-
-###################
-# InnoDB Settings #
-###################
-innodb_file_per_table          = <%= @innodb_file_per_table           %>
-innodb_status_file             = <%= @innodb_status_file              %>
-innodb_support_xa              = <%= @innodb_support_xa               %>
-innodb_flush_log_at_trx_commit = <%= @innodb_flush_log_at_trx_commit  %>
-innodb_buffer_pool_size        = <%= @innodb_buffer_pool_size         %>
-innodb_log_file_size           = <%= @innodb_log_file_size            %>
-innodb_log_group_home_dir      = <%= @datadir                         %>
-innodb_flush_method            = <%= @innodb_flush_method             %>
-innodb_thread_concurrency      = <%= @innodb_thread_concurrency       %>
-innodb_concurrency_tickets     = <%= @innodb_concurrency_tickets      %>
-innodb_doublewrite             = <%= @innodb_doublewrite              %>
-
-# always enable federated storage engine
-federated                      = 1
-
-<% if replication_enabled -%>
-
-########################
-# Replication Settings #
-########################
-log_bin                        = <%= @bindir %>/bin
-relay-log                      = <%= @bindir %>/relay-bin
-relay-log-index                = <%= @bindir %>/relay-bin.index
-expire_logs_days               = <%= @expire_logs_days %>
-
-# Log slave updates so that any machine may be a master
-log_slave_updates
-
-# report as <%= @hostname + '.' + @port %> to master
-report-host=<%= @hostname + '.' + @port %>
-
-<% #automatically generate a unique master server-id from IP -%>
-<% ia = ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3]; -%>
-server-id                      = <%= @server_id                       %>
-
-<% replicate_ignore_db.each do |db| -%>
-replicate_ignore_db            = <%= @db                              %>
-<% end -%>
-<% replicate_ignore_table.each do |table| -%>
-replicate_ignore_table         = <%= @table                           %>
-<% end -%>
-<% replicate_do_db.each do |db| -%>
-replicate_do_db                = <%= @db                              %>
-<% end -%>
-<% replicate_do_table.each do |table| -%>
-replicate_do_table             = <%= @table                           %>
-<% end -%>
-
-<% end # if replication_enabled -%>
-
-<% # set read_only mode based on read_only variable -%>
-read_only                      = <%= @read_only ? 1 : 0               %>
-
-<% # render out any extra_configs as key = value pairs -%>
-<% extra_configs.each do |key, value| -%>
-<%= "#{key} = #{value}" %>
-<% end -%>
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port                           = <%= @port                            %>
-socket                         = <%= @socket_path                     %>
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet             = <%= @max_allowed_packet              %>
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/

-- 
To view, visit https://gerrit.wikimedia.org/r/310785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3d60a2d360f6e5174baae9f6d7cfe7913c663e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to