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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 720c159d7..5e07a4bdf 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
 
@@ -51,13 +56,6 @@ template "/etc/squid/squid.conf" do
   mode 0o644
 end
 
-template "/etc/default/squid" do
-  source "squid.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
@@ -89,8 +87,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
@@ -104,8 +102,8 @@ end
 service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"
+  subscribes :restart, "directory[#{cache_dir}]"
   subscribes :reload, "template[/etc/squid/squid.conf]"
-  subscribes :restart, "template[/etc/default/squid]"
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
@@ -127,7 +125,3 @@ munin_plugin "squid_icp"
 munin_plugin "squid_objectsize"
 munin_plugin "squid_requests"
 munin_plugin "squid_traffic"
-
-Dir.glob("/var/log/squid/zere.log*") do |log|
-  File.unlink(log)
-end