1 files changed, 32 insertions, 28 deletions
diff --git a/manifests/sieve.pp b/manifests/sieve.pp
index 60a6cd9..81f2a1a 100644
--- a/manifests/sieve.pp
+++ b/manifests/sieve.pp
@@ -1,38 +1,42 @@
 class dovecot::sieve {
+
   include ::dovecot
-  package{'dovecot-sieve':
+
+  package { 'dovecot-sieve':
     ensure => installed,
     before => Service['dovecot'],
   }
 
-  file{'/var/lib/dovecot-sieve':
-    ensure => directory,
-    owner => root, group => 0, mode => 0644;
-  }
-  file{'/var/lib/dovecot-sieve/global':
-    ensure => directory,
-    recurse => true,
-    purge => true,
-    force => true,
-    notify => Exec['compile_global_sieve'],
-    owner => root, group => root, mode => 0644;
-  }
-  file{'/var/lib/dovecot-sieve/default.sieve':
-    source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/default.sieve",
-                "puppet:///modules/site-dovecot/sieve/default.sieve",
-                "puppet:///modules/dovecot/sieve/${operatingsystem}/default.sieve",
-                "puppet:///modules/dovecot/sieve/default.sieve" ],
-    notify => Exec['compile_default_sieve'],
-    owner => root, group => root, mode => 0644;
-  }
+  file {
+    '/var/lib/dovecot-sieve':
+      ensure => directory,
+      owner => root, group => 0, mode => 0644;
+ 
+    '/var/lib/dovecot-sieve/global':
+      ensure => directory,
+      recurse => true,
+      purge => true,
+      force => true,
+      notify => Exec['compile_global_sieve'],
+      owner => root, group => root, mode => 0644;
 
-  exec{'compile_default_sieve':
-    command => 'sievec /var/lib/dovecot-sieve/default.sieve',
-    creates => '/var/lib/dovecot-sieve/default.svbin',
-    require => File['/var/lib/dovecot-sieve/default.sieve'],
+    '/var/lib/dovecot-sieve/default.sieve':
+      source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/default.sieve",
+                  "puppet:///modules/site-dovecot/sieve/default.sieve",
+                  "puppet:///modules/dovecot/sieve/${operatingsystem}/default.sieve",
+                  "puppet:///modules/dovecot/sieve/default.sieve" ],
+      notify => Exec['compile_default_sieve'],
+      owner => root, group => root, mode => 0644;
   }
-  exec{'compile_global_sieve':
-    command => 'sievec /var/lib/dovecot-sieve/global/',
-    refreshonly => true,
+
+  exec {
+    'compile_default_sieve':
+      command => 'sievec /var/lib/dovecot-sieve/default.sieve',
+      creates => '/var/lib/dovecot-sieve/default.svbin',
+      require => File['/var/lib/dovecot-sieve/default.sieve'];
+
+    'compile_global_sieve':
+      command => 'sievec /var/lib/dovecot-sieve/global/',
+      refreshonly => true;
   }
 }