From: Stephen Gran <steve@lobefin.net>
Date: Thu, 7 May 2009 00:00:13 +0000 (+0100)
Subject: Can't redefine exim4.conf statement
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a59b4711e0b93431cfa92e55b4a9a2cd4582d0ff;p=dsa-puppet.git

Can't redefine exim4.conf statement
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 80f44d88..b2c1e71f 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -38,12 +38,6 @@ class exim {
           mode    => 750,
           purge   => true
         ;
-        "/etc/exim4/exim4.conf":
-          source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/exim4.conf" ],
-          require => Package["exim4-daemon-heavy"],
-          notify  => Exec["exim4 reload"]
-          ;
         "/etc/exim4/manualroute":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/manualroute",