Andrew Bogott has submitted this change and it was merged.
Change subject: Rearrange mysql module my.cnf defaults.
......................................................................
Rearrange mysql module my.cnf defaults.
This makes them somewhat closer to what generic::mysql-server does.
Change-Id: I02fbdd2e7d2ecb189427cb1c8581c262171d119c
---
M modules/mysql/manifests/params.pp
M modules/mysql/templates/my.cnf.erb
2 files changed, 24 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mysql/manifests/params.pp
b/modules/mysql/manifests/params.pp
index 6a5a699..04ad519 100644
--- a/modules/mysql/manifests/params.pp
+++ b/modules/mysql/manifests/params.pp
@@ -84,15 +84,24 @@
}
'Debian': {
+
+ # begin WMF customization
+ if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10')
>= 0 {
+ $run_directory = '/run'
+ } else {
+ $run_directory = '/var/run'
+ }
+ $socket = "$run_directory/mysqld/mysqld.sock"
+ $pidfile = "$run_directory/mysqld/mysqld.pid"
+ $datadir = '/var/lib/mysql'
+ $log_error = "/var/log/mysql/mysql.err"
+ # end WMF customization
+
$basedir = '/usr'
- $datadir = '/a/sqldata'
$service_name = 'mysql'
$client_package_name = 'mysql-client'
$server_package_name = 'mysql-server'
- $socket = "/tmp/mysqld.sock"
- $pidfile = "/a/sqldata/${::hostname}.pid"
$config_file = '/etc/mysql/my.cnf'
- $log_error = "/a/sqldata/${::hostname}.log"
$ruby_package_name = 'libmysql-ruby'
$python_package_name = 'python-mysqldb'
$php_package_name = 'php5-mysql'
diff --git a/modules/mysql/templates/my.cnf.erb
b/modules/mysql/templates/my.cnf.erb
index 1695d5f..31cbd2d 100644
--- a/modules/mysql/templates/my.cnf.erb
+++ b/modules/mysql/templates/my.cnf.erb
@@ -1,12 +1,19 @@
+###
+#### This file managed by puppet.
+###
+
+
[client]
port = <%= port %>
socket = <%= socket %>
+
[mysqld_safe]
socket = <%= socket %>
nice = 0
<% if log_error == 'syslog' -%>
syslog
<% end -%>
+
[mysqld]
user = mysql
pid-file = <%= pidfile %>
@@ -14,11 +21,11 @@
port = <%= port %>
basedir = <%= basedir %>
datadir = <%= datadir %>
-tmpdir = /a/tmp
+tmpdir = /tmp
skip-external-locking
<% if bind_address %>
-bind-address = <%= bind_address %>
+bind_address = <%= bind_address %>
<% end %>
key_buffer = 1M
@@ -46,7 +53,9 @@
quick
quote-names
max_allowed_packet = 16M
+
[mysql]
+
[isamchk]
key_buffer = 16M
<% if multi_instance == true -%>
--
To view, visit https://gerrit.wikimedia.org/r/89346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02fbdd2e7d2ecb189427cb1c8581c262171d119c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
