Use multipackage installs throughout

[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 b817621ab28632f1d8be985e26fb450049aee28f..850e3805926ac92dfc9cf57ac47932bb494c9e07 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
 <%= node[:web][:log_directory] %>/*.log {
   daily
   missingok

-  rotate 7 
+  rotate 7

   compress
   delaycompress
   notifempty
   compress
   delaycompress
   notifempty


@@ -13,15 +13,15 @@
 <% 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
+    /bin/systemctl try-reload-or-restart gpx-import

 <% end -%>
 <% if File.directory?("#{node[:web][:base_directory]}/cgimap") -%>
 <% 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
 }
 <% end -%>
   endscript
 }