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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f0c26b867..7619d0a9c 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -58,11 +58,6 @@ repository_actions = Hash.new do |_, repository|
   node[:apt][:sources].include?(repository) ? :add : :remove
 end
 
-apt_repository "brightbox-ruby-ng" do
-  action repository_actions["brightbox-ruby-ng"]
-  uri "ppa:brightbox/ruby-ng"
-end
-
 apt_repository "ubuntugis-stable" do
   action repository_actions["ubuntugis-stable"]
   uri "ppa:ubuntugis/ppa"
@@ -86,7 +81,6 @@ end
 apt_repository "openstreetmap" do
   action repository_actions["openstreetmap"]
   uri "ppa:osmadmins/ppa"
-  only_if { node[:lsb][:release].to_f < 22.04 }
 end
 
 apt_repository "management-component-pack" do
@@ -113,17 +107,17 @@ apt_repository "nginx" do
   key "ABF5BD827BD9BF62"
 end
 
-apt_repository "elasticsearch5.x" do
-  action repository_actions["elasticsearch5.x"]
-  uri "https://artifacts.elastic.co/packages/5.x/apt"
+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"
 end
 
-apt_repository "elasticsearch6.x" do
-  action repository_actions["elasticsearch6.x"]
-  uri "https://artifacts.elastic.co/packages/6.x/apt"
+apt_repository "elasticsearch8.x" do
+  action repository_actions["elasticsearch8.x"]
+  uri "https://artifacts.elastic.co/packages/8.x/apt"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"