X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b2bc4956f304c2aafc2760667ae2045ea6882235..0eb2a2b70464e53cd52edcee3b2fa96ac8bc416b:/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 b817621ab..21a37a40a 100644 --- a/cookbooks/web/templates/default/logrotate.web.erb +++ b/cookbooks/web/templates/default/logrotate.web.erb @@ -3,7 +3,7 @@ <%= node[:web][:log_directory] %>/*.log { daily missingok - rotate 7 + rotate 7 compress delaycompress notifempty @@ -11,17 +11,15 @@ sharedscripts postrotate <% if File.directory?("#{node[:web][:base_directory]}/rails") -%> - /usr/bin/passenger-config restart-app --ignore-app-not-running <%= node[:web][:base_directory] %>/rails > /dev/null -<% if node[:recipes].include?("logstash::forwarder") -%> - /usr/bin/service logstash-forwarder restart > /dev/null -<% end -%> + /bin/sleep 30 + PASSENGER_INSTANCE_REGISTRY_DIR=<%= node[:passenger][:instance_registry_dir] %> /usr/bin/passenger-config restart-app --ignore-app-not-running --name rails > /dev/null <% end -%> <% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%> - /usr/bin/service gpx-import rotated + /bin/systemctl try-reload-or-restart gpx-import <% 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 + /bin/systemctl reload cgimap + /usr/bin/rsync --preallocate <%= 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 }