X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c467e79604b147d5d607632cc7c1214b51f3924..beb8b02aa361eaa281949b30e2f54a95e0b0c489:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 146fb1726..51586d61b 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,9 +17,15 @@
 # limitations under the License.
 #
 
-package "apt"
-package "gnupg-curl"
-package "update-notifier-common"
+package %w[
+  apt
+  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
@@ -63,24 +69,37 @@ end
 
 apt_source "ubuntugis-unstable" do
   url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu"
-  key "3089EBE08314DF160"
+  key "089EBE08314DF160"
 end
 
 apt_source "openstreetmap" do
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "D57F48750AC4F2CB"
+  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
-  template "hp.list.erb"
-  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
+  source_template "hp.list.erb"
+  url "https://downloads.linux.hpe.com/SDR/repo/mcp"
   key "C208ADDE26C2B797"
   key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub"
 end
 
 apt_source "hwraid" do
-  template "hwraid.list.erb"
-  url "http://hwraid.le-vert.net/ubuntu"
+  source_template "hwraid.list.erb"
+  url "https://hwraid.le-vert.net/ubuntu"
   key "6005210E23B3D3B4"
 end
 
@@ -90,26 +109,32 @@ apt_source "mapnik-v210" do
 end
 
 apt_source "nginx" do
-  template "nginx.list.erb"
-  url "http://nginx.org/packages/ubuntu"
+  source_template "nginx.list.erb"
+  url "https://nginx.org/packages/ubuntu"
   key "ABF5BD827BD9BF62"
 end
 
-apt_source "elasticsearch" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
+apt_source "elasticsearch1.7" do
+  source_template "elasticsearch.list.erb"
+  url "https://packages.elasticsearch.org/elasticsearch/1.7/debian"
   key "D27D666CD88E42B4"
 end
 
-apt_source "logstash" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstash/2.3/debian"
+apt_source "elasticsearch2.x" do
+  source_template "elasticsearch.list.erb"
+  url "https://packages.elasticsearch.org/elasticsearch/2.x/debian"
   key "D27D666CD88E42B4"
 end
 
-apt_source "logstash-forwarder" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstashforwarder/debian"
+apt_source "elasticsearch5.x" do
+  source_template "elasticsearch.list.erb"
+  url "https://artifacts.elastic.co/packages/5.x/apt"
+  key "D27D666CD88E42B4"
+end
+
+apt_source "logstash" do
+  source_template "elasticsearch.list.erb"
+  url "https://packages.elasticsearch.org/logstash/2.3/debian"
   key "D27D666CD88E42B4"
 end
 
@@ -119,13 +144,13 @@ apt_source "passenger" do
 end
 
 apt_source "postgresql" do
-  template "postgresql.list.erb"
-  url "http://apt.postgresql.org/pub/repos/apt"
+  source_template "postgresql.list.erb"
+  url "https://apt.postgresql.org/pub/repos/apt"
   key "7FCC7D46ACCC4CF8"
 end
 
 apt_source "mediawiki" do
-  template "mediawiki.list.erb"
+  source_template "mediawiki.list.erb"
   url "https://releases.wikimedia.org/debian"
   key "90E9F83F22250DD7"
 end