X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=0aa2e00334ed0a97f6115f69dd7d478dc358bc8c;hb=120045339f8c08d97b45a71a3f1b5840700ff4dc;hp=76a21993cefe03f48e81ee1521931d722793a591;hpb=52c5719778ef59be012da71b2f996d28954bf701;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 76a21993c..0aa2e0033 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -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;
 }