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 fcc5f337c6c07cce8816abab687a599ecab4837d..3b90afcb5442ddc84456e6571a6e070a42b2dad3 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -17,6 +17,9 @@
 # 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
 if node[:squid][:version] >= 3
   apt_package "squid" do
     action :unlock


@@ -112,9 +115,9 @@ service "squid" do
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 

-log "squid-restart" do
-  message "Restarting squid due to counter wraparound"
-  notifies :restart, "service[squid]"
+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?
   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?