rsync: do not compress xz and pbf files

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 9d9e211cf1efb480345b910b3d8d4942f629884c..12a11119abb0cca94537e9b8c17a072042b50cfc 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -86,7 +86,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"


@@ -102,6 +102,7 @@ end
 service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"
 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
   subscribes :reload, "template[/etc/squid/squid.conf]"
   subscribes :reload, "template[/etc/resolv.conf]"
 end


@@ -117,10 +118,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"

+
+munin_plugin "squid_delay_pools" do
+  action :delete
+end
+
+munin_plugin "squid_delay_pools_noreferer" do
+  action :delete
+end