X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=d5c679ac2bb99978f5dae4587f1bf336e0f3d15f;hb=efa6fe77e365574af9d78e671e61e4bbca347695;hp=815ff16781ff89ad9d0d4dce6b460fe8dd99670b;hpb=7569c8f545e7675a56fc711d5fa646b04031ed7a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 815ff1678..d5c679ac2 100644
--- 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/":
@@ -81,6 +81,10 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
                        "puppet:///exim/common/logrotate-exim4-paniclog" ]
           ;
+        "/etc/exim4/local-auto.conf":
+          require => Package["exim4-daemon-heavy"],
+          content => template("exim-local-auto.erb")
+          ;
     }
 
     exec { "exim4 reload":
@@ -89,3 +93,7 @@ class exim {
     }
 }
 
+class eximmx inherits exim {
+    include clamav
+    include postgrey
+}