diff options
Diffstat (limited to 'manifests/server/munin/default.pp')
| -rw-r--r-- | manifests/server/munin/default.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/server/munin/default.pp b/manifests/server/munin/default.pp index 11609d2..91cd5fe 100644 --- a/manifests/server/munin/default.pp +++ b/manifests/server/munin/default.pp @@ -1,7 +1,7 @@ # manage plugins class mysql::server::munin::default { mysql_user{'munin@localhost': - password_hash => trocla("mysql_munin_${::fqdn}",'mysql','length: 32'), + password_hash => mysql_password($mysql::server::munin_password), require => Exec['mysql_set_rootpw'], } @@ -10,18 +10,17 @@ class mysql::server::munin::default { require => Mysql_user['munin@localhost'], } - $munin_mysql_password = trocla("mysql_munin_${::fqdn}",'plain', 'length: 32') munin::plugin { [mysql_queries, mysql_slowqueries]: - config => "env.mysqlopts --user=munin --password='${munin_mysql_password}' -h localhost", + config => "env.mysqlopts --user=munin --password='${mysql::server::munin_password}' -h localhost", require => Mysql_grant['munin@localhost']; [mysql_bytes, mysql_threads]: - config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost", + config => "env.mysqlopts --user=munin --password=${mysql::server::munin_password} -h localhost", require => Mysql_grant['munin@localhost']; } Munin::Plugin::Deploy{ - config => "env.mysqlopts --user=munin --password='${munin_mysql_password}' -h localhost", + config => "env.mysqlopts --user=munin --password='${mysql::server::munin_password}' -h localhost", require => Mysql_grant['munin@localhost'], } munin::plugin::deploy{ |