X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=bd3db80bce5754f166164914fdaa922209051057;hb=3af00336807890e5ca5c4154bdf3fd46447effe5;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..bd3db80bc 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,109 +1,146 @@
 class exim {
 
-    package { exim4-heavy: ensure => latest }
+    package { exim4-daemon-heavy: ensure => latest }
 
     file { 
+        "/etc/exim4/":
+          ensure  => directory,
+          owner   => root,
+          group   => root,
+          mode    => 755,
+          purge   => true
+        ;
         "/etc/exim4/exim4.conf":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
+          ensure  => file,
           source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/exim4.conf" ]
-          require => Package["exim4-heavy"],
-          notify  => Exec["exim4 reload"],
+                       "puppet:///exim/common/exim4.conf" ],
+          require => Package["exim4-daemon-heavy"],
+          notify  => Exec["exim4 reload"]
           ;
         "/etc/exim4/blacklist":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/blacklist" ]
           ;
         "/etc/exim4/callout_users":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           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/" ]
+                       "puppet:///exim/common/callout_users" ]
           ;
         "/etc/exim4/grey_users":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/grey_users" ]
           ;
         "/etc/exim4/helo-check":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
-                       "puppet:///exim/common/" ]
+                       "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,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/localusers",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/localusers" ]
           ;
         "/etc/exim4/rbllist":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/rbllist" ]
           ;
         "/etc/exim4/rcpthosts":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/rcpthosts" ]
           ;
         "/etc/exim4/rhsbllist":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/rhsbllist" ]
           ;
         "/etc/exim4/virtualdomains":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
-                       "puppet:///exim/common/" ]
+                       "puppet:///exim/common/virtualdomains" ]
           ;
         "/etc/exim4/whitelist":
           owner   => root,
           group   => root,
-          mode    => 664,
-          require => Package["exim4-heavy"],
+          mode    => 644,
+          ensure  => file,
+          require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
-                       "puppet:///exim/common/" ]
+                       "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,
     }
 }