From 1a91a29e74c42acf740bfb6d0fa391674c1953bf Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 3 Jun 2009 22:00:01 +0200 Subject: introduced logrotate only if we have vhosts otherwise we get nasty logrotate errors introduced a first logrotate naming scheme. the openbsd logrotation should be integrated in that one as well. --- manifests/centos.pp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'manifests/centos.pp') diff --git a/manifests/centos.pp b/manifests/centos.pp index 01d3ecb..64af2d2 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -35,14 +35,7 @@ class apache::centos inherits apache::package { owner => root, group => 0, mode => 0644; } - # add vhost folders to logrotation - augeas { "logrotate_httpd_vhosts": - changes => [ 'rm /files/etc/logrotate.d/httpd/rule/file', - 'ins file before /files/etc/logrotate.d/httpd/rule/*[1]', - 'ins file before /files/etc/logrotate.d/httpd/rule/*[1]', - 'set /files/etc/logrotate.d/httpd/rule/file[1] /var/log/httpd/*log', - 'set /files/etc/logrotate.d/httpd/rule/file[2] /var/www/vhosts/*/logs/*log' ], - } + include apache::logrotate::centos apache::config::file{ 'welcome.conf': } apache::config::file{ 'vhosts.conf': } -- cgit v1.2.3