Drop mediawiki apt repository

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f0a2c28915d77640584c357a38d61ef0c998d65e..f0c26b86743c5ef611a9e5ce2c991e4d7c3da7a9 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -144,14 +144,6 @@ apt_repository "postgresql" do
   key "7FCC7D46ACCC4CF8"
 end
 
   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"
 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 221a4eb9a3fb0d65a0c57f202b67cf4f4a55af44..7a043d5592285dd5e88d601ef6962b8138b0a0d9 100644 (file)
--- 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
 
 # Default to enabling the "wiki" role
 default[:accounts][:users][:wiki][:status] = :role