Use default template for osmadmins PPA

[chef.git] / cookbooks / apt / recipes / default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 2fcc6fa7871b3559a4b5827c2c6c45d5c063a376..4874d15fbd8a5a894d1f4b417ff2d7fa2d63c362 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -53,14 +53,13 @@ apt_source "ubuntugis-unstable" do
 end
 
 apt_source "openstreetmap" do
-  template "openstreetmap.list.erb"
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "0AC4F2CB"
 end
 
 apt_source "management-component-pack" do
   template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ManagementComponentPack"
+  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
   key "B1275EA3"
 end
 
@@ -110,6 +109,12 @@ apt_source "postgresql" do
   key "ACCC4CF8"
 end
 
+apt_source "mediawiki" do
+  template "mediawiki.list.erb"
+  url "https://releases.wikimedia.org/debian"
+  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+end
+
 package "unattended-upgrades"
 
 auto_upgrades = if node[:apt][:unattended_upgrades][:enable]