X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7e72af6717778f869498e10adcd77404f06c0035..6df5d7a48406b20d84497d2df79b47bde9c86257:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4282ba107..0d4a2d556 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -23,10 +23,6 @@ package %w[
   update-notifier-common
 ]
 
-if node[:lsb][:release].to_f < 18.04
-  package "gnupg-curl"
-end
-
 file "/etc/motd.tail" do
   action :delete
 end
@@ -87,11 +83,7 @@ end
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
-  if node[:lsb][:release].to_f >= 16.04
-    distribution "xenial/current"
-  else
-    distribution "#{node[:lsb][:codename]}/current"
-  end
+  distribution "#{node[:lsb][:codename]}/current"
   components ["non-free"]
   key "C208ADDE26C2B797"
 end
@@ -106,6 +98,7 @@ end
 
 apt_repository "nginx" do
   action repository_actions["nginx"]
+  arch "amd64"
   uri "https://nginx.org/packages/ubuntu"
   components ["nginx"]
   key "ABF5BD827BD9BF62"
@@ -119,9 +112,9 @@ apt_repository "elasticsearch5.x" do
   key "D27D666CD88E42B4"
 end
 
-apt_repository "logstash" do
-  action repository_actions["logstash"]
-  uri "https://packages.elasticsearch.org/logstash/2.3/debian"
+apt_repository "elasticsearch6.x" do
+  action repository_actions["elasticsearch6.x"]
+  uri "https://artifacts.elastic.co/packages/6.x/apt"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"