diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/server/base.pp | 4 | ||||
| -rw-r--r-- | manifests/server/munin/default.pp | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 5b00ddc..07b26b8 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -55,8 +55,8 @@ class mysql::server::base { } exec { 'mysql_set_rootpw': - command => "/usr/local/sbin/setmysqlpass.sh", - unless => "/usr/bin/mysqladmin -uroot status > /dev/null", + command => '/usr/local/sbin/setmysqlpass.sh', + unless => '/usr/bin/mysqladmin -uroot status > /dev/null', require => [ File['mysql_setmysqlpass.sh'], Package['mysql-server'] ], refreshonly => true, } diff --git a/manifests/server/munin/default.pp b/manifests/server/munin/default.pp index 2660ea0..d64c831 100644 --- a/manifests/server/munin/default.pp +++ b/manifests/server/munin/default.pp @@ -20,9 +20,25 @@ class mysql::server::munin::default inherits mysql::server::munin::base { config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost", require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ]; - [ mysql_connections, mysql_qcache, mysql_cache_mem, mysql_size_all ]: + [ mysql_connections, mysql_qcache, mysql_qcache_mem, mysql_size_all ]: script_path_in => "/usr/local/share/munin-plugins", config => "env.mysqlopts --user=munin --password=${munin_mysql_password} -h localhost", require => [ Mysql_grant['munin@localhost'], Mysql_user['munin@localhost'], Package['mysql'] ]; } + + Munin::Plugin::Deploy { + config => "env.mysqlopts --user=munin --password=$munin_mysql_password -h localhost", + require => + [ Mysql_grant['munin@localhost'], + Mysql_user['munin@localhost'], + Package['mysql'] ] + } + munin::plugin::deploy{ + 'mysql_connections': + source => 'mysql/munin/mysql_connections'; + 'mysql_qcache': + source => 'mysql/munin/mysql_qcache'; + 'mysql_qcache_mem': + source => 'mysql/munin/mysql_qcache_mem'; + } } |