X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..9008d777073efab4dd0ffe0d3c79d4b2339726e7:/cookbooks/apt/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 22501640b..51586d61b 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -19,10 +19,14 @@
 
 package %w[
   apt
-  gnupg-curl
+  apt-transport-https
   update-notifier-common
 ]
 
+if node[:lsb][:release].to_f < 18.04
+  package "gnupg-curl"
+end
+
 file "/etc/motd.tail" do
   action :delete
 end
@@ -74,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"
@@ -122,12 +138,6 @@ apt_source "logstash" do
   key "D27D666CD88E42B4"
 end
 
-apt_source "logstash-forwarder" do
-  source_template "elasticsearch.list.erb"
-  url "https://packages.elasticsearch.org/logstashforwarder/debian"
-  key "D27D666CD88E42B4"
-end
-
 apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
   key "561F9B9CAC40B2F7"