X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..6567541ec1e733c401e9fab30771bd6b1bed134b:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 5e07a4bdf..72aeb41cf 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: squid
+# Cookbook:: squid
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-if node[:squid][:version] == "3"
+if node[:squid][:version] >= 3
   apt_package "squid" do
     action :unlock
   end
@@ -62,17 +62,20 @@ directory "/etc/squid/squid.conf.d" do
   mode 0o755
 end
 
-if node[:squid][:cache_dir] =~ /^coss (\S+) /
-  cache_dir = File.dirname(Regexp.last_match(1))
-elsif node[:squid][:cache_dir] =~ /^\S+ (\S+) /
-  cache_dir = Regexp.last_match(1)
-end
+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
 
-directory cache_dir do
-  owner "proxy"
-  group "proxy"
-  mode 0o750
-  recursive true
+  directory cache_dir do
+    owner "proxy"
+    group "proxy"
+    mode 0o750
+    recursive true
+    notifies :restart, "service[squid]"
+  end
 end
 
 systemd_tmpfile "/var/run/squid" do
@@ -82,11 +85,13 @@ systemd_tmpfile "/var/run/squid" do
   mode "0755"
 end
 
+address_families = %w[AF_UNIX AF_INET AF_INET6]
+
 systemd_service "squid" do
   description "Squid caching proxy"
   after ["network.target", "nss-lookup.target"]
   type "forking"
-  limit_nofile 65536
+  limit_nofile 98304
   exec_start_pre "/usr/sbin/squid -N -z"
   exec_start "/usr/sbin/squid -Y"
   exec_reload "/usr/sbin/squid -k reconfigure"
@@ -95,6 +100,7 @@ systemd_service "squid" do
   private_devices true
   protect_system "full"
   protect_home true
+  restrict_address_families address_families
   restart "on-failure"
   timeout_sec 0
 end
@@ -102,7 +108,6 @@ 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 :reload, "template[/etc/resolv.conf]"
 end
@@ -118,10 +123,16 @@ log "squid-restart" do
 end
 
 munin_plugin "squid_cache"
-munin_plugin "squid_delay_pools"
-munin_plugin "squid_delay_pools_noreferer"
 munin_plugin "squid_times"
 munin_plugin "squid_icp"
 munin_plugin "squid_objectsize"
 munin_plugin "squid_requests"
 munin_plugin "squid_traffic"
+
+munin_plugin "squid_delay_pools" do
+  action :delete
+end
+
+munin_plugin "squid_delay_pools_noreferer" do
+  action :delete
+end