Handle interfaces with no address

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index c774bb5fb983da99ba6836dc6265f5756c251b55..3b90afcb5442ddc84456e6571a6e070a42b2dad3 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: squid
+# Cookbook:: squid

 # Recipe:: default
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,6 +17,38 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"
+include_recipe "munin"
+
+if node[:squid][:version] >= 3
+  apt_package "squid" do
+    action :unlock
+  end
+
+  apt_package "squid-common" do
+    action :unlock
+  end
+
+  apt_package "squid" do
+    action :purge
+    only_if "dpkg-query -W squid | fgrep -q 2."
+  end
+
+  apt_package "squid-common" do
+    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
+

 package "squid"
 package "squidclient"
 
 package "squid"
 package "squidclient"
 


@@ -24,61 +56,86 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
   source "squid.conf.erb"
   owner "root"
   group "root"

-  mode 0644
-end
-
-template "/etc/default/squid" do
-  source "squid.erb"
-  owner "root"
-  group "root"
-  mode 0644
+  mode 0o644

 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-if node[:lsb][:release].to_f >= 15.10
-  systemd_service "squid" do
-    description "Squid caching proxy"
-    after ["network.target", "nss-lookup.target"]
-    limit_nofile 65536
-    environment "SQUID_ARGS" => "-D"
-    environment_file "/etc/default/squid"
-    exec_start_pre "/usr/sbin/squid $SQUID_ARGS -z"
-    exec_start "/usr/sbin/squid -N $SQUID_ARGS"
-    exec_reload "/usr/sbin/squid -k reconfigure"
-    exec_stop "/usr/sbin/squid -k shutdown"
-    restart "on-failure"
-    timeout_sec 0
+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
 
   end
 

-  service "squid" do
-    provider Chef::Provider::Service::Systemd
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
-    subscribes :restart, "systemd_service[squid]"
-    subscribes :reload, "template[/etc/squid/squid.conf]"
-    subscribes :restart, "template[/etc/default/squid]"
-    subscribes :reload, "template[/etc/resolv.conf]"
+  directory cache_dir do
+    owner "proxy"
+    group "proxy"
+    mode 0o750
+    recursive true
+    notifies :restart, "service[squid]"

   end
   end

-else
-  service "squid" do
-    provider Chef::Provider::Service::Upstart
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
-    subscribes :reload, "template[/etc/squid/squid.conf]"
-    subscribes :restart, "template[/etc/default/squid]"
-    subscribes :reload, "template[/etc/resolv.conf]"
+end
+
+systemd_tmpfile "/var/run/squid" do
+  type "d"
+  owner "proxy"
+  group "proxy"
+  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 98304
+  exec_start_pre "/usr/sbin/squid --foreground -z"
+  exec_start "/usr/sbin/squid -YC"
+  exec_reload "/bin/kill -HUP $MAINPID"
+  pid_file "/var/run/squid.pid"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  restrict_address_families address_families
+  restart "always"
+  kill_mode "mixed"
+end
+
+service "squid" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_service[squid]"
+  subscribes :restart, "template[/etc/squid/squid.conf]"
+  subscribes :reload, "template[/etc/resolv.conf]"
+end
+
+service "squid-restart" do
+  service_name "squid"
+  action :restart
+  only_if do
+    IO.popen(["squidclient", "--host=127.0.0.1", "--port=3128", "mgr:counters"]) do |io|
+      io.each.grep(/^[a-z][a-z_.]+ = -[0-9]+$/).count.positive?
+    end

   end
 end
 
 munin_plugin "squid_cache"
   end
 end
 
 munin_plugin "squid_cache"

-munin_plugin "squid_delay_pools"

 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