squid: force restart on config change. Reload unsafe

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index ce1edf966a4210efa0f59d3638debe0fb230e1d2..dae04ddeb4eb7393ebf22ee3d7189cf84cecb990 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -85,9 +85,7 @@ systemd_tmpfile "/var/run/squid" do
   mode "0755"
 end
 
   mode "0755"
 end
 

-address_families = %w[AF_UNIX AF_INET]
-
-# address_families << "AF_INET6" unless node.interfaces(:family => :inet6).empty?
+address_families = %w[AF_UNIX AF_INET AF_INET6]

 
 systemd_service "squid" do
   description "Squid caching proxy"
 
 systemd_service "squid" do
   description "Squid caching proxy"


@@ -110,7 +108,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 :reload, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/squid/squid.conf]"

   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 


@@ -118,20 +116,12 @@ log "squid-restart" do
   message "Restarting squid due to counter wraparound"
   notifies :restart, "service[squid]"
   only_if do
   message "Restarting squid due to counter wraparound"
   notifies :restart, "service[squid]"
   only_if do

-    IO.popen(["squidclient", "--host=127.0.0.1", "--port=80", "mgr:counters"]) do |io|
+    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
 
       io.each.grep(/^[a-z][a-z_.]+ = -[0-9]+$/).count.positive?
     end
   end
 end
 

-log "squid-restart-shm" do
-  message "Restarting squid due to remounted /dev/shm"
-  notifies :restart, "service[squid]"
-  not_if do
-    File.exist?("/dev/shm/squid-squid-page-pool.shm")
-  end
-end
-

 munin_plugin "squid_cache"
 munin_plugin "squid_times"
 munin_plugin "squid_icp"
 munin_plugin "squid_cache"
 munin_plugin "squid_times"
 munin_plugin "squid_icp"