X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=a8868507ddc4670d4431d1c2ad037a7eea719e26;hb=14db07797701c9487e9ff44b899f2653ed4daec5;hp=2d8b237929bc557328d995c9f2b6283ac24c3928;hpb=a45d4aa22b037d2094f08251e1ff40da8da2ddcc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 2d8b23792..a8868507d 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -18,11 +18,10 @@ class exim {
           purge   => true
         ;
         "/etc/exim4/exim4.conf":
-          source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/exim4.conf" ],
+          content => template("exim/eximconf.erb"),
           require => Package["exim4-daemon-heavy"],
           notify  => Exec["exim4 reload"]
-          ;
+        ;
         "/etc/exim4/manualroute":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/manualroute",
@@ -137,8 +136,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class eximmx inherits exim {
-    include clamav
-    include postgrey
-}