From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Jun 2022 16:34:03 +0000 (+0100)
Subject: Drop mediawiki apt repository
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/1a861da6a1387e89b90c8fdc223513c54ccdebda?ds=sidebyside;hp=395bc48986b07dfcaee86aa176dc52ede3b69f1b

Drop mediawiki apt repository
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f0a2c2891..f0c26b867 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -144,14 +144,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"
diff --git a/cookbooks/mediawiki/attributes/default.rb b/cookbooks/mediawiki/attributes/default.rb
index 221a4eb9a..7a043d559 100644
--- a/cookbooks/mediawiki/attributes/default.rb
+++ b/cookbooks/mediawiki/attributes/default.rb
@@ -1,6 +1,3 @@
-# Add the mediawiki APT source
-default[:apt][:sources] = node[:apt][:sources] | ["mediawiki"]
-
 # Default to enabling the "wiki" role
 default[:accounts][:users][:wiki][:status] = :role