Fix planet mirror script run before new year planetdump

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 050f806f6a0a68cee597e2ba6094854d6932683d..2fcc6fa7871b3559a4b5827c2c6c45d5c063a376 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"
 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
 end
 
 apt_source "hwraid" do


@@ -83,17 +83,24 @@ end
 
 apt_source "elasticsearch" do
   template "elasticsearch.list.erb"
 
 apt_source "elasticsearch" do
   template "elasticsearch.list.erb"

-  url "http://packages.elasticsearch.org/elasticsearch/1.3/debian"
+  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"

   key "D88E42B4"
 end
 
   key "D88E42B4"
 end
 

-apt_source "passenger" do
-  url "https://oss-binaries.phusionpassenger.com/apt/passenger"
-  key "AC40B2F7"
+apt_source "logstash" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  key "D88E42B4"

 end
 
 end
 

-apt_source "passenger4" do
-  url "https://oss-binaries.phusionpassenger.com/apt/passenger/4"
+apt_source "logstash-forwarder" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"
+  key "D88E42B4"
+end
+
+apt_source "passenger" do
+  url "https://oss-binaries.phusionpassenger.com/apt/passenger"

   key "AC40B2F7"
 end
 
   key "AC40B2F7"
 end
 


@@ -102,3 +109,25 @@ apt_source "postgresql" do
   url "http://apt.postgresql.org/pub/repos/apt"
   key "ACCC4CF8"
 end
   url "http://apt.postgresql.org/pub/repos/apt"
   key "ACCC4CF8"
 end

+
+package "unattended-upgrades"
+
+auto_upgrades = if node[:apt][:unattended_upgrades][:enable]
+                  IO.read("/usr/share/unattended-upgrades/20auto-upgrades")
+                else
+                  IO.read("/usr/share/unattended-upgrades/20auto-upgrades-disabled")
+                end
+
+file "/etc/apt/apt.conf.d/20auto-upgrades" do
+  user "root"
+  group "root"
+  mode 0644
+  content auto_upgrades
+end
+
+template "/etc/apt/apt.conf.d/60chef" do
+  source "apt.conf.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end