Merge branch 'leap_master'

Conflicts:
	files/munin/dovecot
	manifests/base.pp
	manifests/centos.pp
	manifests/debian.pp
	manifests/expire.pp
	manifests/init.pp
	manifests/munin.pp
	manifests/quota.pp
	manifests/sieve.pp
	manifests/sql.pp

1 files changed, 2 insertions, 7 deletions

diff --git a/manifests/munin.pp b/manifests/munin.pp
index 56b6945..5996604 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,12 +1,7 @@
 class dovecot::munin {
+
   munin::plugin::deploy{'dovecot':
     source => "dovecot/munin/dovecot",
-    config => "env.logfile /var/log/dovecot/infos.log
-group mail"
-  } -> file{'/var/lib/munin/plugin-state/plugin-dovecot.state':
-    ensure => file,
-    owner  => munin,
-    group  => mail,
-    mode   => 0660;
+    config => "env.logfile /var/log/dovecot/dovecot.log\ngroup dovecot"
   }
 }