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 d5db76b2fafa45b87822419432514e1ad93b8b92..40a2240b419c66c6bb5984a24373fb7ed689bb88 100644 (file)
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -4,7 +4,7 @@
   daily
   compress
   compresscmd /usr/bin/xz
-  compressoptions --threads=<% [ node[:cpu][:total] / 2, 1 ].max.ceil %>
+  compressoptions --threads=<%= [ node[:cpu][:total] / 2, 1 ].max.ceil %>
   uncompresscmd /usr/bin/unxz
   compressext .xz
   rotate 2
@@ -12,7 +12,11 @@
   nocreate
   sharedscripts
   postrotate
+<% if node[:lsb][:release].to_f < 20.04 -%>
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
+<% 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