Fix logrotate for squid 4.11

[chef.git] / cookbooks / tilecache / templates / default / logrotate.squid.erb

diff --git a/cookbooks/tilecache/templates/default/logrotate.squid.erb b/cookbooks/tilecache/templates/default/logrotate.squid.erb
index e6bfbc688a0c851c70986db62a3a0d20f060464b..40a2240b419c66c6bb5984a24373fb7ed689bb88 100644 (file)
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -4,6 +4,7 @@
   daily
   compress
   compresscmd /usr/bin/xz
   daily
   compress
   compresscmd /usr/bin/xz

+  compressoptions --threads=<%= [ node[:cpu][:total] / 2, 1 ].max.ceil %>

   uncompresscmd /usr/bin/unxz
   compressext .xz
   rotate 2
   uncompresscmd /usr/bin/unxz
   compressext .xz
   rotate 2


@@ -11,7 +12,13 @@
   nocreate
   sharedscripts
   postrotate
   nocreate
   sharedscripts
   postrotate

+<% if node[:lsb][:release].to_f < 20.04 -%>

     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate

-    /usr/bin/rsync /var/log/squid/zere.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true
+<% else -%>
+    test ! -e /run/squid/squid.pid || /usr/sbin/squid -k rotate
+<% end -%>
+  endscript
+  lastaction
+    /usr/bin/rsync --preallocate /var/log/squid/access.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true

   endscript
 }
   endscript
 }