Mercurial > repos > other > Puppet
diff manifests/templates.pp @ 126:8316d4e55e92 puppet-3.6
Fix Apache 2.4 Logwatch support
Uses tweaked files from https://sourceforge.net/p/logwatch/git/ci/2ecdeb6e3b62814ad69e7371e69d2a26315fc45e/
We need to use "http-error-24.conf" so that Logwatch doesn't apply standard HTTP date formats to the error log and lose all log messages
(Also includes a fix to remove a file from Puppet that we removed from disk - not committed separately because I didn't find it until
I went to puppet apply this, and I couldn't be bothered rushing to work out how to do partial commits)
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Tue, 13 Sep 2016 21:04:40 +0100 |
| parents | ca711ab45f17 |
| children | 379089631403 |
line wrap: on
line diff
--- a/manifests/templates.pp Tue Sep 13 20:53:16 2016 +0100 +++ b/manifests/templates.pp Tue Sep 13 21:04:40 2016 +0100 @@ -280,8 +280,11 @@ file { '/etc/logwatch/conf/logfiles/http.conf': content => 'LogFile = apache/access_*.log', } + file { '/etc/logwatch/conf/logfiles/http-error-24.conf': + source => 'puppet:///common/logwatch/log-http-error.conf', + } file { '/etc/logwatch/conf/logfiles/http-error.conf': - source => 'puppet:///common/logwatch/log-http-error.conf', + ensure=> absent, } file { '/etc/logwatch/conf/services/http-error.conf': source => 'puppet:///common/logwatch/services-http-error.conf',