From e394fa01040abd1e7e4fdabc11298889666a4872 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 3 Jan 2020 00:08:37 +0000 Subject: [PATCH] Remove squid upgrade logic --- cookbooks/tilecache/recipes/default.rb | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 395ee54dc..63de8a529 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -100,25 +100,6 @@ squid_fragment "tilecache" do variables :caches => tilecaches, :renders => tilerenders end -if node[:packages][:squid][:version].to_f < 4.9 - Array(node[:squid][:cache_dir]).each do |cache_dir| - if cache_dir =~ /^coss (\S+) / - cache_dir = File.dirname(Regexp.last_match(1)) - elsif cache_dir =~ /^\S+ (\S+) / - cache_dir = Regexp.last_match(1) - end - - file "#{cache_dir}/rock" do - action :delete - backup false - end - end - - package "squid" do - action :upgrade - end -end - package "rsync" template "/etc/logrotate.d/squid" do -- 2.43.2