Drop support for passenger 4

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 01b6b8328c1d424afa21bbc90103b70b91c09583..7467ef16b845ad964030fda27218014a60227026 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -61,7 +61,7 @@ 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
@@ -83,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
 
@@ -92,7 +104,8 @@ apt_source "passenger" do
   key "AC40B2F7"
 end
 
-apt_source "passenger4" do
-  url "https://oss-binaries.phusionpassenger.com/apt/passenger/4"
-  key "AC40B2F7"
+apt_source "postgresql" do
+  template "postgresql.list.erb"
+  url "http://apt.postgresql.org/pub/repos/apt"
+  key "ACCC4CF8"
 end