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, 16 insertions, 13 deletions

diff --git a/manifests/expire/sqlite.pp b/manifests/expire/sqlite.pp
index a9fed4b..b1724e1 100644
--- a/manifests/expire/sqlite.pp
+++ b/manifests/expire/sqlite.pp
@@ -1,19 +1,22 @@
 class dovecot::expire::sqlite {
-  include ::sqlite
-  file{'/var/lib/dovecot/expire.db':
-    ensure => file,
-    replace => false,
-    require => Package['sqlite'],
-    owner => root, group => 0, mode => 0600;
-  }
-  file{'/var/lib/dovecot/expire.sql':
-    source => "puppet:///modules/dovecot/expire/expire.sqlite.sql",
-    require => File['/var/lib/dovecot/expire.db'],
-    notify => Exec['create_expire_db'],
-    owner => root, group => 0, mode => 0600;
+
+  include dovecot::sql::sqlite
+
+  file {
+    '/var/lib/dovecot/expire.db':
+      ensure => file,
+      replace => false,
+      require => Package['sqlite'],
+      owner => root, group => 0, mode => 0600;
+
+    '/var/lib/dovecot/expire.sql':
+      source => "puppet:///modules/dovecot/expire/expire.sqlite.sql",
+      require => File['/var/lib/dovecot/expire.db'],
+      notify => Exec['create_expire_db'],
+      owner => root, group => 0, mode => 0600;
   }
 
-  exec{'create_expire_db':
+  exec { 'create_expire_db':
     command => 'cat /var/lib/dovecot/expire.sql | sqlite3 /var/lib/dovecot/expire.db',
     refreshonly => true,
   }