diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /manifests/logrotate/centos/vhosts.pp | |
parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'manifests/logrotate/centos/vhosts.pp')
-rw-r--r-- | manifests/logrotate/centos/vhosts.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/logrotate/centos/vhosts.pp b/manifests/logrotate/centos/vhosts.pp index 941f50d..b1159a1 100644 --- a/manifests/logrotate/centos/vhosts.pp +++ b/manifests/logrotate/centos/vhosts.pp @@ -1,10 +1,11 @@ +# add vhost folders to logrotation class apache::logrotate::centos::vhosts inherits apache::logrotate::centos { - # add vhost folders to logrotation Augeas['logrotate_httpd']{ 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' ], + onlyif => 'get /files/etc/logrotate.d/httpd/rule/file[2] != "/var/www/vhosts/*/logs/*log"', } } |