Update piwik to 3.1.0

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 917834eb2ad1a33ef5ae4bce0224ecd1640fda01..54e6e4af4848d5a3056cf05c1d8dc7d397e7d3aa 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -50,6 +50,11 @@ systemd_service "squid" do
   exec_start "/usr/sbin/squid -N $SQUID_ARGS"
   exec_reload "/usr/sbin/squid -k reconfigure"
   exec_stop "/usr/sbin/squid -k shutdown"
   exec_start "/usr/sbin/squid -N $SQUID_ARGS"
   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
+  no_new_privileges true

   restart "on-failure"
   timeout_sec 0
 end
   restart "on-failure"
   timeout_sec 0
 end


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

 munin_plugin "squid_cache"
 munin_plugin "squid_delay_pools"
 munin_plugin "squid_delay_pools_noreferer"
 munin_plugin "squid_cache"
 munin_plugin "squid_delay_pools"
 munin_plugin "squid_delay_pools_noreferer"