Fix logrotate for squid 4.11

diff --git a/cookbooks/tilecache/templates/default/logrotate.squid.erb b/cookbooks/tilecache/templates/default/logrotate.squid.erb
index 697f0c5c6057a3040a62fda7dce23fff24e24926..40a2240b419c66c6bb5984a24373fb7ed689bb88 100644 (file)
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -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