From: Stephen Gran <steve@lobefin.net>
Date: Tue, 17 Nov 2009 17:52:21 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d5ca537c9fc2a218038cc330b5dd0b11931adfa;hp=6492ddd94a7ca8f8e63d63a046af694d6f4bd0e8;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 2e361b5f2..cf1699d82 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -19,6 +19,20 @@ class exim {
           mode    => 755,
           purge   => true
         ;
+        "/etc/exim4/Git":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => puppet:///empty/
+        ;
+        "/etc/exim4/conf.d":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => puppet:///empty/
+        ;
         "/etc/exim4/ssl":
           ensure  => directory,
           owner   => root,