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, 8 insertions, 2 deletions

diff --git a/manifests/managesieve.pp b/manifests/managesieve.pp
index efe4435..625de4a 100644
--- a/manifests/managesieve.pp
+++ b/manifests/managesieve.pp
@@ -5,7 +5,13 @@ class dovecot::managesieve(
     'sieve-hostname' => $::fqdn,
   }
 ) {
-  package{'dovecot-managesieve':
+
+  $managesieve_package = $operatingsystem ? {
+    debian => managesieved,
+    default => managesieve
+  }
+
+  package { $managesieve_package:
     ensure => installed,
     before => Service['dovecot'],
   }
@@ -18,7 +24,7 @@ class dovecot::managesieve(
   }
 
   if $dovecot::managesieve::nagios_checks {
-    nagios::service{"managesieve":
+    nagios::service { "managesieve":
       check_command => "check_managesieve!${dovecot::managesieve::nagios_checks['sieve-hostname']}";
     }
   }