Fix munin mysql plugin configuration.

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 8f496df38e58f9cd69cea76999f770b4b781e217..93f7ff735cf8e91bfda4f43fda223d7736e83a55 100644 (file)
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -19,7 +19,7 @@ class nodo::role::mail {
     ensure => present,
   }
   munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
-    config => "user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf",
+    config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf",
     ensure => $virtual ? {
        true     => present,
        default  => absent,

diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index 0273571dbc760674ad69614cf8e2e36440ab62be..9d3db39463772eeb3fc1055bbc268fb3570c482e 100644 (file)
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -15,7 +15,7 @@ class nodo::role::web inherits nodo::base::vserver {
   }
   munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
     ensure => present,
-    config => "user root\nenv.mysqluser debian-sys-maint\nenv.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf",
+    config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf",
   }
 
   # Classes for web nodes