X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=1bf8a46277bab11b108ad41d1215f1cbd84668b9;hb=19e1deb652a7911e33d4e1504720eb3ad9a431ec;hp=c1bd00128df939e59bbed3bacfd32970ba0077dc;hpb=1dcbe2cfccccd5ecabbb66c4703acca7c92a93a3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index c1bd00128..1bf8a4627 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -11,105 +11,76 @@ class exim {
           purge   => true
         ;
         "/etc/exim4/exim4.conf":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
                        "puppet:///exim/common/exim4.conf" ],
           require => Package["exim4-daemon-heavy"],
           notify  => Exec["exim4 reload"]
           ;
         "/etc/exim4/blacklist":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
                        "puppet:///exim/common/blacklist" ]
           ;
         "/etc/exim4/callout_users":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
                        "puppet:///exim/common/callout_users" ]
           ;
         "/etc/exim4/grey_users":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
                        "puppet:///exim/common/grey_users" ]
           ;
         "/etc/exim4/helo-check":
-          owner   => root,
-          group   => root,
-          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":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/locals",
+                       "puppet:///exim/common/locals" ]
+          ;
         "/etc/exim4/localusers":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/localusers",
                        "puppet:///exim/common/localusers" ]
           ;
         "/etc/exim4/rbllist":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
                        "puppet:///exim/common/rbllist" ]
           ;
         "/etc/exim4/rcpthosts":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
                        "puppet:///exim/common/rcpthosts" ]
           ;
         "/etc/exim4/rhsbllist":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
                        "puppet:///exim/common/rhsbllist" ]
           ;
         "/etc/exim4/virtualdomains":
-          owner   => root,
-          group   => root,
-          mode    => 644,
-          ensure  => file,
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
                        "puppet:///exim/common/virtualdomains" ]
           ;
         "/etc/exim4/whitelist":
-          owner   => root,
-          group   => root,
-          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":
+          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":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
+                       "puppet:///exim/common/logrotate-exim4-paniclog" ]
+          ;
     }
 
     exec { "exim4 reload":