X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/eae50fd446d7fc41ab1f96ad94925e6a5cdb95b2..5a54de662cc20970428a52549fda56e209c887db:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 659e06536..87f97a11a 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
@@ -88,7 +83,7 @@ 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.3/debian"
   key "D88E42B4"
 end
 
@@ -96,3 +91,8 @@ 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