diff options
author | Marcel Haerry <haerry@puzzle.ch> | 2009-06-09 11:13:19 +0200 |
---|---|---|
committer | Marcel Haerry <haerry@puzzle.ch> | 2009-06-09 11:13:19 +0200 |
commit | 11499b9d5cb3f752d31bef683153e82ec02860e7 (patch) | |
tree | f36a884f71f3497aca286576d9ea873c6e6c7033 /manifests/centos.pp | |
parent | cb45fccb3e3ff37b06393784972751163cd7b6a3 (diff) | |
parent | 1a91a29e74c42acf740bfb6d0fa391674c1953bf (diff) |
Merge commit 'immerda/master' into development
Diffstat (limited to 'manifests/centos.pp')
-rw-r--r-- | manifests/centos.pp | 9 |
1 files changed, 1 insertions, 8 deletions
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': } |