X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21feca976678ddfb1a4d312a5c8b619385c1b03f..874b26a17120e4000178b246f292a7cbed8e2a46:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 3cc26880e..8f57b88c9 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -20,10 +20,13 @@
 package %w[
   apt
   apt-transport-https
-  gnupg-curl
   update-notifier-common
 ]
 
+if node[:lsb][:release].to_f < 18.04
+  package "gnupg-curl"
+end
+
 file "/etc/motd.tail" do
   action :delete
 end
@@ -75,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"