Use precise packages from hwraid for trusty

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f11894a7604e801c52737254cee798ebb98a58fe..c004043ef9c7068dfe498f6a6c87d7bbb6555c0e 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
-  notifies :run, resources(:execute => "apt-update")
+  notifies :run, "execute[apt-update]"
 end
 
 apt_source "opscode" do
@@ -78,11 +78,6 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
-apt_source "aw-drupal" do
-  url "http://ppa.launchpad.net/aw/drupal/ubuntu"
-  key "7D5AE8F6"
-end
-
 apt_source "openstreetmap" do
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "0AC4F2CB"
@@ -101,6 +96,7 @@ apt_source "management-component-pack" do
 end
 
 apt_source "hwraid" do
+  template "hwraid.list.erb"
   url "http://hwraid.le-vert.net/ubuntu"
   key "23B3D3B4"
 end
@@ -111,7 +107,13 @@ apt_source "mapnik-v210" do
 end
 
 apt_source "nginx" do
+  template "nginx.list.erb"
   url "http://nginx.org/packages/ubuntu"
   key "7BD9BF62"
 end
 
+apt_source "elasticsearch" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
+  key "D88E42B4"
+end