From 1a861da6a1387e89b90c8fdc223513c54ccdebda Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 28 Jun 2022 17:34:03 +0100 Subject: [PATCH 1/1] Drop mediawiki apt repository --- cookbooks/apt/recipes/default.rb | 8 -------- cookbooks/mediawiki/attributes/default.rb | 3 --- 2 files changed, 11 deletions(-) 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 -- 2.39.5