Redirect fix for HSTS preloading of osm.org domain

[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 ab906c68878e350be5c5622d5434007477e3a03d..7f9e1de77e20a55e7130c8678b3986f12135d687 100644 (file)
--- 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,14 @@
   sharedscripts
   postrotate
 <% if File.directory?("#{node[:web][:base_directory]}/rails") -%>
-    /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 -%>
+    PASSENGER_INSTANCE_REGISTRY_DIR=<%= node[:passenger][:instance_registry_dir] %> /usr/bin/passenger-config restart-app --ignore-app-not-running <%= node[:web][:base_directory] %>/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
 }