A try at a nagios server

[mirror/dsa-puppet.git] / modules / exim / manifests / init.pp

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 265fda1..d5c679a 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,6 +1,6 @@
 class exim {
 
-    package { exim4-daemon-heavy: ensure => latest }
+    package { exim4-daemon-heavy: ensure => installed }
 
     file {
         "/etc/exim4/":
@@ -94,29 +94,6 @@ class exim {
 }
 
 class eximmx inherits exim {
-    package { "clamav-daemon": ensure => latest;
-              "postgrey": ensure => installed;
-    }
-
-    file {
-        "/etc/default/postgrey":
-          source  => "puppet:///exim/common/postgrey-default",
-          require => Package["postgrey"],
-          notify  => Exec["postgrey restart"]
-          ;
-        "/etc/clamav/clamd.conf":
-          source  => "puppet:///exim/common/clamd.conf",
-          require => Package["clamav-daemon"],
-          notify  => Exec["clamav-daemon restart"]
-          ;
-    }
-
-    exec { "clamav-daemon restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    exec { "postgrey restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+    include clamav
+    include postgrey
 }