X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=1d4a252aa6a4c7f6890b7101ad581c638abd6430;hb=8b747208b9de3e9b39be81ece2bd9c723858520b;hp=572b40c59767f582de22da6ed5a14f384bebdf8a;hpb=b24e4ca01f87202ee01047cffc571711037e3398;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 572b40c59..1d4a252aa 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -8,9 +8,9 @@ class exim {
           group   => root,
           mode    => 664,
           source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/exim4.conf" ]
+                       "puppet:///exim/common/exim4.conf" ],
           require => Package["exim4-heavy"],
-          notify  => Exec["exim4 reload"],
+          notify  => Exec["exim4 reload"]
           ;
         "/etc/exim4/blacklist":
           owner   => root,
@@ -28,14 +28,6 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
                        "puppet:///exim/common/" ]
           ;
-        "/etc/exim4/exim4.conf":
-          owner   => root,
-          group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/" ]
-          ;
         "/etc/exim4/grey_users":
           owner   => root,
           group   => root,