Unlock squid 2.x packages before removing them

[chef.git] / cookbooks / squid / recipes / default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 720c159d7897a82ec23890a840f90660bacc6aa3..484f24e6b0337b88b7ebdb81c66bf842796b1f5a 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -18,6 +18,14 @@
 #
 
 if node[:squid][:version] == "3"
+  apt_package "squid" do
+    action :unlock
+  end
+
+  apt_package "squid-common" do
+    action :unlock
+  end
+
   package "squid" do
     action :remove
     only_if "dpkg-query -W squid | fgrep -q 2."
@@ -28,14 +36,6 @@ if node[:squid][:version] == "3"
     only_if "dpkg-query -W squid-common | fgrep -q 2."
   end
 
-  apt_package "squid" do
-    action :unlock
-  end
-
-  apt_package "squid-common" do
-    action :unlock
-  end
-
   file "/store/squid/coss-01" do
     action :delete
   end
@@ -89,7 +89,7 @@ systemd_service "squid" do
   after ["network.target", "nss-lookup.target"]
   type "forking"
   limit_nofile 65536
-  exec_start_pre "/usr/sbin/squid -z"
+  exec_start_pre "/usr/sbin/squid -N -z"
   exec_start "/usr/sbin/squid"
   exec_reload "/usr/sbin/squid -k reconfigure"
   exec_stop "/usr/sbin/squid -k shutdown"