Add squid2 and squid3 repositories and install the correct one

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 24b425e8a47f4ea400a5f265bad691608018e27a..8f57b88c9283508ab7e4bb8032e09b7ad57ed949 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -78,6 +78,18 @@ apt_source "openstreetmap" do
   update true
 end
 
+apt_source "squid2" do
+  url "http://ppa.launchpad.net/osmadmins/squid2/ubuntu"
+  key "D57F48750AC4F2CB"
+  update true
+end
+
+apt_source "squid3" do
+  url "http://ppa.launchpad.net/osmadmins/squid3/ubuntu"
+  key "D57F48750AC4F2CB"
+  update true
+end
+
 apt_source "management-component-pack" do
   source_template "hp.list.erb"
   url "https://downloads.linux.hpe.com/SDR/repo/mcp"

diff --git a/cookbooks/squid/attributes/default.rb b/cookbooks/squid/attributes/default.rb
index 6a7c649d37b0be1d9a34e265e71927399604c94b..2f49acad05f713642021be7bdd63718ad8117909 100644 (file)
--- a/cookbooks/squid/attributes/default.rb
+++ b/cookbooks/squid/attributes/default.rb
@@ -2,3 +2,5 @@ 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 openstreetmap"
+
+default[:apt][:sources] = node[:apt][:sources] | ["squid#{node[:squid][:version]}"]