Add support for squid 4

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index e22b00eec50b40d9027a3ddf7ee77b18b6942229..fe5077bcd68a45bbac842349f5fb020978cc5b77 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-if node[:squid][:version] == "3"
+if node[:squid][:version] >= 3

   apt_package "squid" do
     action :unlock
   end
   apt_package "squid" do
     action :unlock
   end


@@ -62,17 +62,20 @@ directory "/etc/squid/squid.conf.d" do
   mode 0o755
 end
 
   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
 end
 
 systemd_tmpfile "/var/run/squid" do


@@ -86,7 +89,7 @@ systemd_service "squid" do
   description "Squid caching proxy"
   after ["network.target", "nss-lookup.target"]
   type "forking"
   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"
   exec_start_pre "/usr/sbin/squid -N -z"
   exec_start "/usr/sbin/squid -Y"
   exec_reload "/usr/sbin/squid -k reconfigure"


@@ -117,14 +120,16 @@ log "squid-restart" do
 end
 
 munin_plugin "squid_cache"
 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_times"
 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)
+munin_plugin "squid_delay_pools" do
+  action :delete
+end
+
+munin_plugin "squid_delay_pools_noreferer" do
+  action :delete

 end
 end