X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f3b1617008c17e80dbc15af4b1bb8c7d03a4799e..09e1d1b06ddd3a2ef96f4e9d6deb3e749ed292c8:/cookbooks/apt/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index b1e5825eb..ab1285e92 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,17 +29,12 @@ 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_template
+  source "sources.list.erb"
   owner "root"
   group "root"
   mode 0644
-  notifies :run, "execute[apt-update]"
+  notifies :run, "execute[apt-update]", :immediately
 end
 
 apt_source "brightbox-ruby-ng" do
@@ -57,18 +52,16 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-if node[:lsb][:release].to_f == 12.04 || node[:lsb][:release].to_f == 12.10
-  apt_source "openstreetmap" do
-    template "openstreetmap.list.erb"
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
+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
@@ -90,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
 
@@ -98,3 +103,14 @@ apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
   key "AC40B2F7"
 end
+
+apt_source "passenger4" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger/4"
+  key "AC40B2F7"
+end
+
+apt_source "postgresql" do
+  template "postgresql.list.erb"
+  url "http://apt.postgresql.org/pub/repos/apt"
+  key "ACCC4CF8"
+end