X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=8bdb36955a2ffffa7385e68cfdea28cbf161f5fe;hb=43decd25c1e3a5252b85bbc9d78319d9604ecbba;hp=7b446db0afc3f5ded378ccf8e1350e00e3469583;hpb=693a9c8b22f23f211871f1525b97879068e17fc1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 7b446db0a..8bdb36955 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -15,8 +15,12 @@ class exim {
           owner   => root,
           group   => Debian-exim,
           mode    => 750,
+          require => Package["exim4-daemon-heavy"],
           purge   => true
         ;
+        "/etc/mailname":
+          content => template("exim/mailname.erb"),
+        ;
         "/etc/exim4/exim4.conf":
           content => template("exim/eximconf.erb"),
           require => Package["exim4-daemon-heavy"],
@@ -27,6 +31,11 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/manualroute",
                        "puppet:///exim/common/manualroute" ]
           ;
+        "/etc/exim4/host_blacklist":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
+                       "puppet:///exim/common/host_blacklist" ]
+          ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
@@ -47,10 +56,6 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
                        "puppet:///exim/common/helo-check" ]
           ;
-        "/etc/exim4/bsmtp":
-          require => Package["exim4-daemon-heavy"],
-          content => template("exim/bsmtp.erb")
-          ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
           content => template("exim/locals.erb")