X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/89562ec46a08430f7540fcb88209a6b042cf631b..a725f6d3959f30f6600026178192e5f237a1a805:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 720c159d7..6b2e25eff 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -18,26 +18,31 @@
 #
 
 if node[:squid][:version] == "3"
-  package "squid" do
-    action :remove
-    only_if "dpkg-query -W squid | fgrep -q 2."
+  apt_package "squid" do
+    action :unlock
   end
 
-  package "squid-common" do
-    action :remove
-    only_if "dpkg-query -W squid-common | fgrep -q 2."
+  apt_package "squid-common" do
+    action :unlock
   end
 
   apt_package "squid" do
-    action :unlock
+    action :purge
+    only_if "dpkg-query -W squid | fgrep -q 2."
   end
 
   apt_package "squid-common" do
-    action :unlock
+    action :purge
+    only_if "dpkg-query -W squid-common | fgrep -q 2."
   end
 
   file "/store/squid/coss-01" do
     action :delete
+    backup false
+  end
+
+  package "squidclient" do
+    action :upgrade
   end
 end
 
@@ -89,8 +94,8 @@ systemd_service "squid" do
   after ["network.target", "nss-lookup.target"]
   type "forking"
   limit_nofile 65536
-  exec_start_pre "/usr/sbin/squid -z"
-  exec_start "/usr/sbin/squid"
+  exec_start_pre "/usr/sbin/squid -N -z"
+  exec_start "/usr/sbin/squid -Y"
   exec_reload "/usr/sbin/squid -k reconfigure"
   exec_stop "/usr/sbin/squid -k shutdown"
   private_tmp true