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, 20 insertions, 0 deletions

diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp
new file mode 100644
index 0000000..5256d60
--- /dev/null
+++ b/manifests/expire/mysql.pp
@@ -0,0 +1,20 @@
+class dovecot::expire::mysql {
+
+  file { 'dovecot-dict-expire.conf':
+    source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/mysql-dict-expire.conf",
+                "puppet:///modules/site_dovecot/expire/mysql-dict-expire.conf",
+                "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf",
+                "puppet:///modules/dovecot/expire/mysql-dict-expire.conf" ],
+    path => $operatingsystem ? {
+      'debian' => '/etc/dovecot/dovecot-dict-expire.conf',
+      default => '/etc/dovecot-dict-expire.conf'
+    },
+    require => $version ? {
+      2 => Package['dovecot-mysql'],
+      default => Package['dovecot'],
+    },
+    notify => Service['dovecot'],
+    owner => root, group => 0, mode => 0600;
+  }
+
+}