X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d3ecbe3df5a6b604319ae2864e36e24e5f9e12d0..f4ea2c7270a0b80748cc3efb58d12300b4c2061e:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 1b48ddfda..7467ef16b 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,12 +34,7 @@ template "/etc/apt/sources.list" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, "execute[apt-update]"
-end
-
-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
+  notifies :run, "execute[apt-update]", :immediately
 end
 
 apt_source "brightbox-ruby-ng" do
@@ -47,16 +42,6 @@ apt_source "brightbox-ruby-ng" do
   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,28 +52,16 @@ 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
-  apt_source "openstreetmap" do
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
-end
-
-apt_source "proliant-support-pack" do
-  template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack"
-  key "2689B887"
+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"
-  key "2689B887"
+  key "B1275EA3"
 end
 
 apt_source "hwraid" do
@@ -110,7 +83,19 @@ end
 
 apt_source "elasticsearch" do
   template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
+  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash-forwarder" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"
   key "D88E42B4"
 end
 
@@ -118,3 +103,9 @@ apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
   key "AC40B2F7"
 end
+
+apt_source "postgresql" do
+  template "postgresql.list.erb"
+  url "http://apt.postgresql.org/pub/repos/apt"
+  key "ACCC4CF8"
+end