Don't configure a flood_stage watermark for elasticsearch 5.x

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

diff --git a/cookbooks/squid/attributes/default.rb b/cookbooks/squid/attributes/default.rb
index 990b0dc170f9f6bc5159199e814088a5839e6895..2f49acad05f713642021be7bdd63718ad8117909 100644 (file)
--- a/cookbooks/squid/attributes/default.rb
+++ b/cookbooks/squid/attributes/default.rb
@@ -1,4 +1,6 @@
-
+default[:squid][:version] = "2"
 default[:squid][:cache_mem] = "256 MB"
 default[:squid][:cache_dir] = "ufs /var/spool/squid 256 16 256"
-default[:squid][:access_log] = "/var/log/squid/access.log squid"
+default[:squid][:access_log] = "/var/log/squid/access.log openstreetmap"
+
+default[:apt][:sources] = node[:apt][:sources] | ["squid#{node[:squid][:version]}"]