From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Jun 2018 22:01:33 +0000 (+0100)
Subject: Purge old squid to clean config and upgrade squidclient
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/80388d9a4e108a60b3434ccdf308699804d22fb1

Purge old squid to clean config and upgrade squidclient
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index ac120a258..c02c67cf4 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -26,13 +26,13 @@ if node[:squid][:version] == "3"
     action :unlock
   end
 
-  package "squid" do
-    action :remove
+  apt_package "squid" do
+    action :purge
     only_if "dpkg-query -W squid | fgrep -q 2."
   end
 
-  package "squid-common" do
-    action :remove
+  apt_package "squid-common" do
+    action :purge
     only_if "dpkg-query -W squid-common | fgrep -q 2."
   end
 
@@ -40,6 +40,10 @@ if node[:squid][:version] == "3"
     action :delete
     backup false
   end
+
+  package "squidclient" do
+    action :upgrade
+  end
 end
 
 package "squid"