X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5b61dc78ec8857086174b99aa68ec7ee7f439e0b..769cb990dc0f948e7a36456d38ad2216fdd738a7:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f11894a76..dea088bb6 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,13 +34,7 @@ template "/etc/apt/sources.list" do
   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,14 +72,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"
+if node[:lsb][:release].to_f < 14.04
+  apt_source "openstreetmap" do
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end
 end
 
 apt_source "proliant-support-pack" do
@@ -101,6 +92,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
@@ -111,7 +103,13 @@ apt_source "mapnik-v210" do
 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