squid: remove broken logrotate file + no cache digest

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 12a11119abb0cca94537e9b8c17a072042b50cfc..78741e3e2f2ad8aa0f728a9080ad10868bddef52 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: squid
+# Cookbook:: squid

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,7 +17,10 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-if node[:squid][:version] == "3"
+include_recipe "apt"
+include_recipe "munin"
+
+if node[:squid][:version] >= 3

   apt_package "squid" do
     action :unlock
   end
   apt_package "squid" do
     action :unlock
   end


@@ -62,17 +65,20 @@ directory "/etc/squid/squid.conf.d" do
   mode 0o755
 end
 
   mode 0o755
 end
 

-if node[:squid][:cache_dir] =~ /^coss (\S+) /
-  cache_dir = File.dirname(Regexp.last_match(1))
-elsif node[:squid][:cache_dir] =~ /^\S+ (\S+) /
-  cache_dir = Regexp.last_match(1)
-end
+Array(node[:squid][:cache_dir]).each do |cache_dir|
+  if cache_dir =~ /^coss (\S+) /
+    cache_dir = File.dirname(Regexp.last_match(1))
+  elsif cache_dir =~ /^\S+ (\S+) /
+    cache_dir = Regexp.last_match(1)
+  end

 
 

-directory cache_dir do
-  owner "proxy"
-  group "proxy"
-  mode 0o750
-  recursive true
+  directory cache_dir do
+    owner "proxy"
+    group "proxy"
+    mode 0o750
+    recursive true
+    notifies :restart, "service[squid]"
+  end

 end
 
 systemd_tmpfile "/var/run/squid" do
 end
 
 systemd_tmpfile "/var/run/squid" do


@@ -82,36 +88,44 @@ systemd_tmpfile "/var/run/squid" do
   mode "0755"
 end
 
   mode "0755"
 end
 

+address_families = %w[AF_UNIX AF_INET AF_INET6]
+
+file "/etc/systemd/system/squid.service" do
+  action :delete
+end
+
+file "/etc/logrotate.d/squid.dpkg-dist" do
+  action :delete
+end
+

 systemd_service "squid" do
 systemd_service "squid" do

-  description "Squid caching proxy"
-  after ["network.target", "nss-lookup.target"]
-  type "forking"
+  dropin "chef"

   limit_nofile 98304
   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"

   private_tmp true
   private_devices true
   protect_system "full"
   protect_home true
   private_tmp true
   private_devices true
   protect_system "full"
   protect_home true

-  restart "on-failure"
-  timeout_sec 0
+  restrict_address_families address_families
+  restart "always"

 end
 
 service "squid" do
 end
 
 service "squid" do

-  action [:enable, :start]
+  action :enable

   subscribes :restart, "systemd_service[squid]"
   subscribes :restart, "systemd_service[squid]"

-  subscribes :restart, "directory[#{cache_dir}]"
-  subscribes :reload, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/squid/squid.conf]"

   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]"
+notify_group "squid-start" do
+  action :run
+  notifies :start, "service[squid]"
+end
+
+service "squid-restart" do
+  service_name "squid"
+  action :restart

   only_if do
   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
       io.each.grep(/^[a-z][a-z_.]+ = -[0-9]+$/).count.positive?
     end
   end