X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0eab3bc4dbd340dd5e8bfb2491dd86c771c70b92..a5a3b8b5d676e4e7c46f5124325d2ca799bee76f:/cookbooks/squid/recipes/default.rb diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index 3260e14d5..c2bd5b834 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,27 +17,32 @@ # limitations under the License. # -if node[:squid][:version] == "3" - package "squid" do - action :remove - only_if "dpkg-query -W squid | fgrep -q 2." +if node[:squid][:version] >= 3 + 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,30 +56,26 @@ 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" 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 @@ -84,19 +85,24 @@ systemd_tmpfile "/var/run/squid" do mode "0755" end +address_families = %w[AF_UNIX AF_INET] + +# address_families << "AF_INET6" unless node.interfaces(:family => :inet6).empty? + 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" + exec_start "/usr/sbin/squid -Y" exec_reload "/usr/sbin/squid -k reconfigure" exec_stop "/usr/sbin/squid -k shutdown" private_tmp true private_devices true protect_system "full" protect_home true + restrict_address_families address_families restart "on-failure" timeout_sec 0 end @@ -105,7 +111,6 @@ service "squid" do action [:enable, :start] subscribes :restart, "systemd_service[squid]" subscribes :reload, "template[/etc/squid/squid.conf]" - subscribes :restart, "template[/etc/default/squid]" subscribes :reload, "template[/etc/resolv.conf]" end @@ -120,14 +125,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" -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