Mercurial > repos > other > Puppet
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 125:ca711ab45f17 | 126:8316d4e55e92 |
|---|---|
| 278 content => 'Detail = Med', | 278 content => 'Detail = Med', |
| 279 } | 279 } |
| 280 file { '/etc/logwatch/conf/logfiles/http.conf': | 280 file { '/etc/logwatch/conf/logfiles/http.conf': |
| 281 content => 'LogFile = apache/access_*.log', | 281 content => 'LogFile = apache/access_*.log', |
| 282 } | 282 } |
| 283 file { '/etc/logwatch/conf/logfiles/http-error-24.conf': | |
| 284 source => 'puppet:///common/logwatch/log-http-error.conf', | |
| 285 } | |
| 283 file { '/etc/logwatch/conf/logfiles/http-error.conf': | 286 file { '/etc/logwatch/conf/logfiles/http-error.conf': |
| 284 source => 'puppet:///common/logwatch/log-http-error.conf', | 287 ensure=> absent, |
| 285 } | 288 } |
| 286 file { '/etc/logwatch/conf/services/http-error.conf': | 289 file { '/etc/logwatch/conf/services/http-error.conf': |
| 287 source => 'puppet:///common/logwatch/services-http-error.conf', | 290 source => 'puppet:///common/logwatch/services-http-error.conf', |
| 288 } | 291 } |
| 289 file { '/etc/logwatch/conf/logfiles/php.conf': | 292 file { '/etc/logwatch/conf/logfiles/php.conf': |