Use osmosis 0.47.4 for hourly and daily replication

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index dae04ddeb4eb7393ebf22ee3d7189cf84cecb990..3b90afcb5442ddc84456e6571a6e070a42b2dad3 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+include_recipe "munin"
+
 if node[:squid][:version] >= 3
   apt_package "squid" do
     action :unlock
@@ -92,17 +95,17 @@ systemd_service "squid" do
   after ["network.target", "nss-lookup.target"]
   type "forking"
   limit_nofile 98304
-  exec_start_pre "/usr/sbin/squid -N -z"
-  exec_start "/usr/sbin/squid -Y"
-  exec_reload "/usr/sbin/squid -k reconfigure"
-  exec_stop "/usr/sbin/squid -k shutdown"
+  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 "on-failure"
-  timeout_sec 0
+  restart "always"
+  kill_mode "mixed"
 end
 
 service "squid" do
@@ -112,9 +115,9 @@ service "squid" do
   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?