X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/26f4ea548415ecc20ad1eeb2b9954f64e257931e..8aff36f30dc7d2df2ba40783f422b2405106e926:/cookbooks/apt/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f0a2c2891..f69db4f3e 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
@@ -121,9 +115,9 @@ apt_repository "elasticsearch5.x" do
   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"
@@ -144,14 +138,6 @@ apt_repository "postgresql" do
   key "7FCC7D46ACCC4CF8"
 end
 
-apt_repository "mediawiki" do
-  action repository_actions["mediawiki"]
-  uri "https://releases.wikimedia.org/debian"
-  distribution "jessie-mediawiki"
-  components ["main"]
-  key "AF380A3036A03444"
-end
-
 apt_repository "docker" do
   action repository_actions["docker"]
   uri "https://download.docker.com/linux/ubuntu"