Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317542
Change subject: proxysql: Fix process check and user permissions; Fix .my.cnf
......................................................................
proxysql: Fix process check and user permissions; Fix .my.cnf
By default, make root the default owner.
Fix mistake on .my.cnf template not adding the password for access.
Bug: T148500
Change-Id: Ice1fde7c6f61d8492840dc24f14771ad40c0ac0b
---
M modules/proxysql/templates/root.my.cnf.erb
M modules/role/manifests/labs/db/proxy.pp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/317542/1
diff --git a/modules/proxysql/templates/root.my.cnf.erb
b/modules/proxysql/templates/root.my.cnf.erb
index fd7360e..0727f8d 100644
--- a/modules/proxysql/templates/root.my.cnf.erb
+++ b/modules/proxysql/templates/root.my.cnf.erb
@@ -1,6 +1,6 @@
[client]
user = <%= @admin_user %>
-<% if @password -%>
+<% if @admin_password -%>
password = <%= @admin_password %>
<% end -%>
socket = <%= @admin_socket %>
diff --git a/modules/role/manifests/labs/db/proxy.pp
b/modules/role/manifests/labs/db/proxy.pp
index 72fba7d..5e32505 100644
--- a/modules/role/manifests/labs/db/proxy.pp
+++ b/modules/role/manifests/labs/db/proxy.pp
@@ -23,7 +23,7 @@
file {'/var/run/proxysql':
ensure => directory,
- owner => 'proxysql',
+ owner => 'root',
group => 'root',
mode => '0755',
require => Class['proxysql'],
@@ -31,8 +31,8 @@
nrpe::monitor_service { 'proxysql':
description => 'proxysql processes',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1: \
--a "proxysql"',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs \
+-c 2:2 -C proxysql',
critical => false,
contact_group => 'admins', # show on icinga/irc only
}
--
To view, visit https://gerrit.wikimedia.org/r/317542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice1fde7c6f61d8492840dc24f14771ad40c0ac0b
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
