cleaning of postgrey module

1 files changed, 9 insertions, 19 deletions

diff --git a/modules/postgrey/manifests/init.pp b/modules/postgrey/manifests/init.pp
index 8d55a77c..44703b61 100644
--- a/modules/postgrey/manifests/init.pp
+++ b/modules/postgrey/manifests/init.pp
@@ -1,31 +1,21 @@
 class postgrey {
-    package { postgrey:
-        ensure => installed
-    }
+    package { postgrey: }
     
     service { postgrey:
         ensure => running,
         path => "/etc/init.d/postgrey",
-        subscribe => [ Package[postgrey]]
+        subscribe => Package[postgrey],
     }
 
-    file { "/etc/sysconfig/postgrey":
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        content => template("postgrey/postgrey.sysconfig"),
-        notify => [ Service[postgrey] ],
+    File {
+        notify => Service[postgrey],
         require => Package[postgrey],    
     }
 
-    file { "/etc/postfix/postgrey_whitelist_clients.local":
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        content => template("postgrey/whitelist_clients.local"),
-        require => Package[postgrey],
-        notify => [ Service[postgrey]],
+    file {
+        "/etc/sysconfig/postgrey":
+            content => template("postgrey/postgrey.sysconfig");
+        "/etc/postfix/postgrey_whitelist_clients.local":
+            content => template("postgrey/whitelist_clients.local");
     }
 }