X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=bd3db80bce5754f166164914fdaa922209051057;hb=3af00336807890e5ca5c4154bdf3fd46447effe5;hp=152a12ae989e71190df9ea3ab3d1d69c8dfc2522;hpb=c584234ee84b9e9a879500e12d14a8f8f36e6437;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 152a12ae9..bd3db80bc 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -56,6 +56,15 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
                        "puppet:///exim/common/helo-check" ]
           ;
+        "/etc/exim4/locals":
+          owner   => root,
+          group   => root,
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/locals",
+                       "puppet:///exim/common/locals" ]
+          ;
         "/etc/exim4/localusers":
           owner   => root,
           group   => root,
@@ -110,10 +119,28 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
                        "puppet:///exim/common/whitelist" ]
           ;
+        "/etc/logrotate.d/exim4-base":
+          owner   => root,
+          group   => root,
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
+                       "puppet:///exim/common/logrotate-exim4-base" ]
+          ;
+        "/etc/logrotate.d/exim4-paniclog":
+          owner   => root,
+          group   => root,
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
+                       "puppet:///exim/common/logrotate-exim4-paniclog" ]
+          ;
     }
 
     exec { "exim4 reload":
-        path        => "/etc/init.d/",
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
 }