Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377693 )
Change subject: phabricator/mariadb: Update database configuration for
stretch/10.1
......................................................................
phabricator/mariadb: Update database configuration for stretch/10.1
Bug: T175679
Change-Id: I40a2d8b21e09825d7426183ce2d633fea6a4ce70
---
M modules/role/manifests/mariadb/misc/phabricator.pp
M modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
2 files changed, 4 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/377693/1
diff --git a/modules/role/manifests/mariadb/misc/phabricator.pp
b/modules/role/manifests/mariadb/misc/phabricator.pp
index 35ae252..0adc728 100644
--- a/modules/role/manifests/mariadb/misc/phabricator.pp
+++ b/modules/role/manifests/mariadb/misc/phabricator.pp
@@ -7,7 +7,6 @@
$snapshot = false,
$ssl = 'puppet-cert',
$p_s = 'on',
- $mariadb10 = true,
) {
system::role { 'mariadb::misc':
@@ -25,13 +24,13 @@
include role::mariadb::monitor
include passwords::misc::scripts
+ include ::base::firewall
include role::mariadb::ferm
class { 'role::mariadb::groups':
mysql_group => 'misc',
mysql_shard => $shard,
mysql_role => $mysql_role,
- socket => '/tmp/mysql.sock',
}
$read_only = $master ? {
@@ -85,7 +84,6 @@
shard => $shard,
datacenter => $::site,
enabled => $master,
- socket => '/tmp/mysql.sock',
}
unless $master {
@@ -93,7 +91,6 @@
is_critical => false,
contact_group => 'admins',
multisource => false,
- socket => '/tmp/mysql.sock',
}
}
}
diff --git
a/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
b/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
index cc00ab7..42c535e 100644
--- a/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
+++ b/modules/role/templates/mariadb/mysqld_config/phabricator.my.cnf.erb
@@ -2,7 +2,7 @@
[client]
port = 3306
-socket = /tmp/mysql.sock
+socket = <%= @socket %>
<% if @ssl == 'on' %>
# ssl
ssl-ca=/etc/mysql/ssl/cacert.pem
@@ -22,7 +22,7 @@
[mysqld]
user = mysql
-socket = /tmp/mysql.sock
+socket = <%= @socket %>
port = 3306
extra_port = 3307
basedir = <%= @basedir %>
@@ -100,20 +100,7 @@
# dump and load innodb buffer at start and stop
innodb_buffer_pool_load_at_startup = 1
innodb_buffer_pool_dump_at_shutdown = 1
-<% if @kernelversion < "3.19" %>
-# Until kernel 3.16 http://www.spinics.net/lists/stable/msg61873.html
-# At least, I think so. For now we need to avoid the an assertion failure on
Trusty w/ 3.13
-innodb_use_native_aio = 0
-innodb_read_io_threads = 16
-innodb_write_io_threads = 8
-<% end %>
-<% if @ssl == 'on' %>
-# ssl
-ssl-ca=/etc/mysql/ssl/cacert.pem
-ssl-cert=/etc/mysql/ssl/server-cert.pem
-ssl-key=/etc/mysql/ssl/server-key.pem
-ssl-cipher=TLSv1.2
-<% elsif @ssl == 'puppet-cert' %>
+<% if @ssl == 'on' or @ssl == 'puppet-cert' %>
# ssl
ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem
ssl-cert=/etc/mysql/ssl/cert.pem
@@ -155,4 +142,3 @@
quick
max_allowed_packet = 32M
-#!includedir /etc/mysql/conf.d/
--
To view, visit https://gerrit.wikimedia.org/r/377693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a2d8b21e09825d7426183ce2d633fea6a4ce70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
