X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c9ea623c34055db8bcca45c8b3f46a3af7008d33..e00c2b061d3fc3e14464e5102920b244eda4ee7f:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 195d9750e..c7e53c669 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"
@@ -88,21 +83,6 @@ apt_repository "openstreetmap" do
   uri "ppa:osmadmins/ppa"
 end
 
-apt_repository "squid2" do
-  action repository_actions["squid2"]
-  uri "ppa:osmadmins/squid2"
-end
-
-apt_repository "squid3" do
-  action repository_actions["squid3"]
-  uri "ppa:osmadmins/squid3"
-end
-
-apt_repository "squid4" do
-  action repository_actions["squid4"]
-  uri "ppa:osmadmins/squid4"
-end
-
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
@@ -143,6 +123,14 @@ apt_repository "elasticsearch6.x" do
   key "D27D666CD88E42B4"
 end
 
+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"
+end
+
 apt_repository "passenger" do
   action repository_actions["passenger"]
   uri "https://oss-binaries.phusionpassenger.com/apt/passenger"
@@ -158,14 +146,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"