From: Tom Hughes Date: Fri, 12 Jul 2013 08:26:03 +0000 (+0100) Subject: Move log archiving and stats analysis to ironbelly X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e02514cb0c657bc6c6195d20a94296fe6e697bd2?ds=sidebyside Move log archiving and stats analysis to ironbelly --- diff --git a/cookbooks/web/templates/default/logrotate.apache.erb b/cookbooks/web/templates/default/logrotate.apache.erb index 6b8a6615e..15e529001 100644 --- a/cookbooks/web/templates/default/logrotate.apache.erb +++ b/cookbooks/web/templates/default/logrotate.apache.erb @@ -11,6 +11,6 @@ sharedscripts postrotate /usr/bin/service apache2 reload > /dev/null - /usr/bin/rsync /var/log/apache2/access.log.2.gz horntail::logs/www.openstreetmap.org/<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz + /usr/bin/rsync /var/log/apache2/access.log.2.gz ironbelly::logs/www.openstreetmap.org/<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz endscript } diff --git a/roles/horntail.rb b/roles/horntail.rb index 894eb0d07..aec36a2a1 100644 --- a/roles/horntail.rb +++ b/roles/horntail.rb @@ -107,7 +107,6 @@ default_attributes( run_list( "role[ic]", "role[planet]", - "role[stats]", "role[backup]", "recipe[rsyncd]" ) diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index cb807544d..959f9f74a 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -83,6 +83,7 @@ run_list( "role[web-storage]", "role[supybot]", "role[backup]", + "role[stats]", "recipe[rsyncd]", "recipe[openvpn]" )