X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/99c79947578a0e098f9325274c1e72eade85901b..3bf78aaba3d1931d0505fa465555d3f1aa019e03:/cookbooks/squid/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index 9d9e211cf..12a11119a 100644 --- 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" - 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" @@ -102,6 +102,7 @@ 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 @@ -117,10 +118,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