X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/95c5b6eab1ab292c95ad3c1eb7ac729dee6757a5..15219fdfa4b2d38fd413e91e5aab3d409449f26a:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index e3faae46b..dae04ddeb 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.
@@ -85,9 +85,7 @@ 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?
+address_families = %w[AF_UNIX AF_INET AF_INET6]
 
 systemd_service "squid" do
   description "Squid caching proxy"
@@ -110,7 +108,7 @@ end
 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
 
@@ -118,7 +116,7 @@ log "squid-restart" 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