We want templates in the git tree

[mirror/dsa-puppet.git] / modules / exim / manifests / init.pp

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 2530329..bd3db80 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -7,12 +7,13 @@ class exim {
           ensure  => directory,
           owner   => root,
           group   => root,
-          mode    => 775
+          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" ],
@@ -22,7 +23,7 @@ class exim {
         "/etc/exim4/blacklist":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
@@ -31,7 +32,7 @@ class exim {
         "/etc/exim4/callout_users":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
@@ -40,7 +41,7 @@ class exim {
         "/etc/exim4/grey_users":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
@@ -49,16 +50,25 @@ class exim {
         "/etc/exim4/helo-check":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           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,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/localusers",
@@ -67,7 +77,7 @@ class exim {
         "/etc/exim4/rbllist":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
@@ -76,7 +86,7 @@ class exim {
         "/etc/exim4/rcpthosts":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
@@ -85,7 +95,7 @@ class exim {
         "/etc/exim4/rhsbllist":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
@@ -94,7 +104,7 @@ class exim {
         "/etc/exim4/virtualdomains":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
@@ -103,16 +113,34 @@ class exim {
         "/etc/exim4/whitelist":
           owner   => root,
           group   => root,
-          mode    => 664,
+          mode    => 644,
           ensure  => file,
           require => Package["exim4-daemon-heavy"],
           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,
     }
 }