X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3aa7c1c38a56374821133c7881f50224bdb03644..7be9473d2bb0cfc6f839e72ee8ad9ea209067f85:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index d3ec6e4c5..9c0b62ab7 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,18 +29,17 @@ 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, resources(:execute => "apt-update")
-end
-
-apt_source "opscode" do
-  template "opscode.list.erb"
-  url "http://apt.opscode.com/"
-  key "83EF826A"
+  notifies :run, "execute[apt-update]"
 end
 
 apt_source "brightbox" do
@@ -78,20 +77,11 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
-apt_source "aw-drupal" do
-  url "http://ppa.launchpad.net/aw/drupal/ubuntu"
-  key "7D5AE8F6"
-end
-
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
-end
-
-apt_source "proliant-support-pack" do
-  template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack"
-  key "2689B887"
+if node[:lsb][:release].to_f == 12.04
+  apt_source "openstreetmap" do
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end
 end
 
 apt_source "management-component-pack" do
@@ -101,6 +91,7 @@ apt_source "management-component-pack" do
 end
 
 apt_source "hwraid" do
+  template "hwraid.list.erb"
   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end
@@ -109,3 +100,20 @@ apt_source "mapnik-v210" do
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
   key "5D50B6BA"
 end
+
+apt_source "nginx" do
+  template "nginx.list.erb"
+  url "http://nginx.org/packages/ubuntu"
+  key "7BD9BF62"
+end
+
+apt_source "elasticsearch" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
+  key "D88E42B4"
+end
+
+apt_source "passenger" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger"
+  key "AC40B2F7"
+end