Correct interface names on clifford

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 89377089f072bf912448f81180600dab10fc00f7..def3d9187f2aa642c2c90a654ad588a83cc8b3f1 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -24,58 +24,57 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/default/squid" do
   source "squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
-if node[:lsb][:release].to_f >= 15.10
-  execute "systemctl-daemon-reload" do
-    action :nothing
-    command "systemctl daemon-reload"
-  end
+systemd_service "squid" do
+  description "Squid caching proxy"
+  after ["network.target", "nss-lookup.target"]
+  limit_nofile 65536
+  environment "SQUID_ARGS" => "-D"
+  environment_file "/etc/default/squid"
+  exec_start_pre "/usr/sbin/squid $SQUID_ARGS -z"
+  exec_start "/usr/sbin/squid -N $SQUID_ARGS"
+  exec_reload "/usr/sbin/squid -k reconfigure"
+  exec_stop "/usr/sbin/squid -k shutdown"
+  restart "on-failure"
+  timeout_sec 0
+end
 
-  template "/etc/systemd/system/squid.service" do
-    source "squid.service.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    notifies :run, "execute[systemctl-daemon-reload]"
-  end
+service "squid" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_service[squid]"
+  subscribes :reload, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/default/squid]"
+  subscribes :reload, "template[/etc/resolv.conf]"
+end
 
-  service "squid" do
-    provider Chef::Provider::Service::Systemd
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
-    subscribes :restart, "template[/etc/systemd/system/squid.service]"
-    subscribes :reload, "template[/etc/squid/squid.conf]"
-    subscribes :restart, "template[/etc/default/squid]"
-    subscribes :reload, "template[/etc/resolv.conf]"
-  end
-else
-  service "squid" do
-    provider Chef::Provider::Service::Upstart
-    action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
-    subscribes :reload, "template[/etc/squid/squid.conf]"
-    subscribes :restart, "template[/etc/default/squid]"
-    subscribes :reload, "template[/etc/resolv.conf]"
+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 > 0
+    end
   end
 end
 
 munin_plugin "squid_cache"
 munin_plugin "squid_delay_pools"
+munin_plugin "squid_delay_pools_noreferer"
 munin_plugin "squid_times"
 munin_plugin "squid_icp"
 munin_plugin "squid_objectsize"