From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Jun 2016 07:28:35 +0000 (+0100)
Subject: Fix web server logrotate for Ubuntu 16.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/52e7ef10423de8f0ca6d315cec30a9ad63936acf?hp=0a236a864373304ba6d6494e02113aa54f8e24cb

Fix web server logrotate for Ubuntu 16.04
---

diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb
index b817621ab..97502eb88 100644
--- a/cookbooks/web/templates/default/logrotate.web.erb
+++ b/cookbooks/web/templates/default/logrotate.web.erb
@@ -13,14 +13,14 @@
 <% 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
+    /etc/init.d/logstash-forwarder restart > /dev/null
 <% end -%>
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/gpx-import") -%>
-    /usr/bin/service gpx-import rotated
+    /etc/init.d/gpx-import rotated
 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
-    /usr/bin/service cgimap reload
+    /etc/init.d/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