imagery: fix delete service action to match create

[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 f14a2c1eae2f115e76115d785d8bbcb1d01f849e..7f9e1de77e20a55e7130c8678b3986f12135d687 100644 (file)
--- a/cookbooks/web/templates/default/logrotate.web.erb
+++ b/cookbooks/web/templates/default/logrotate.web.erb
@@ -11,13 +11,10 @@
   sharedscripts
   postrotate
 <% if File.directory?("#{node[:web][:base_directory]}/rails") -%>
   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") -%>
-    /etc/init.d/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") -%>
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%>

-    /bin/systemctl reload gpx-import
+    /bin/systemctl try-reload-or-restart gpx-import

 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
     /bin/systemctl reload cgimap
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
     /bin/systemctl reload cgimap