X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e9413cd75e1d60c95af2250b0b83988aeb19c6fa..3b36774a40f2a975666c5b47bc59f5e2ecd28de9:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index c4cd3acc3..013c5bc34 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,34 +29,24 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
+sources_template = case node[:lsb][:release].to_f
+  when 12.10 then "old-sources.list.erb"
+  else "sources.list.erb"
+end
+
 template "/etc/apt/sources.list" do
-  source "sources.list.erb"
+  source sources_template
   owner "root"
   group "root"
   mode 0644
   notifies :run, "execute[apt-update]"
 end
 
-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
-end
-
 apt_source "brightbox-ruby-ng" do
   url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
   key "C3173AA6"
 end
 
-apt_source "brightbox-ruby-ng-experimental" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu-experimental"
-  key "C3173AA6"
-end
-
-apt_source "pitti-postgresql" do
-  url "http://ppa.launchpad.net/pitti/postgresql/ubuntu"
-  key "8683D8A2"
-end
-
 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
   key "314DF160"
@@ -67,12 +57,7 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  key "8D0DC64F"
-end
-
-if node[:lsb][:release].to_f < 14.04
+if node[:lsb][:release].to_f == 12.04
   apt_source "openstreetmap" do
     url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
     key "0AC4F2CB"