Ignore messages restarting logstash-forwarder

[chef.git] / cookbooks / web / templates / default / logrotate.web.erb

diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb
index 83a6758286b33a72f8f1244093cdaa5fcebcd65f..ab906c68878e350be5c5622d5434007477e3a03d 100644 (file)
--- a/cookbooks/web/templates/default/logrotate.web.erb
+++ b/cookbooks/web/templates/default/logrotate.web.erb
@@ -11,13 +11,17 @@
   sharedscripts
   postrotate
 <% if File.directory?("#{node[:web][:base_directory]}/rails") -%>
-    /bin/touch <%= node[:web][:base_directory] %>/rails/tmp/restart.txt
+    /usr/bin/passenger-config restart-app <%= node[:web][:base_directory] %>/rails > /dev/null
+<% if node[:recipes].include?("logstash::forwarder") -%>
+    /usr/bin/service logstash-forwarder restart > /dev/null
+<% end -%>
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%>
     /usr/bin/service gpx-import rotated
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
     /usr/bin/service cgimap reload
+    /usr/bin/rsync <%= node[:web][:log_directory] %>/cgimap.log.2.gz ironbelly::logs/www.openstreetmap.org/cgimap-<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.gz
 <% end -%>
   endscript
 }