Move readonly load to katla

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 189c0be4dedee2b98fc91c71fd895f98d5be8fc3..050f806f6a0a68cee597e2ba6094854d6932683d 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -34,7 +34,7 @@ template "/etc/apt/sources.list" do
   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  notifies :run, "execute[apt-update]"
+  notifies :run, "execute[apt-update]", :immediately

 end
 
 apt_source "brightbox-ruby-ng" do
 end
 
 apt_source "brightbox-ruby-ng" do


@@ -83,7 +83,7 @@ end
 
 apt_source "elasticsearch" do
   template "elasticsearch.list.erb"
 
 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
 
   key "D88E42B4"
 end
 


@@ -91,3 +91,14 @@ apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
   key "AC40B2F7"
 end
   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