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 b817621ab28632f1d8be985e26fb450049aee28f..97502eb88a9bfabec21fda061fba18bd200fff59 100644 (file)
--- 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") -%>
 <% 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") -%>
 <% 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") -%>
 <% 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
     /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