Update to logstash 2.3

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 5d477caf1b7ee1aed9ceb62586d351dc8ebd1c8f..6f36c099dc1a07efc01cda66808fdf2cee09fd9e 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -37,9 +37,15 @@ template "/etc/apt/sources.list" do
   notifies :run, "execute[apt-update]", :immediately
 end
 
-apt_source "brightbox-ruby-ng" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
-  key "C3173AA6"
+if node[:lsb][:release].to_f >= 16.04
+  apt_source "brightbox-ruby-ng" do
+    action :delete
+  end
+else
+  apt_source "brightbox-ruby-ng" do
+    url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
+    key "C3173AA6"
+  end
 end
 
 apt_source "ubuntugis-stable" do
@@ -53,15 +59,14 @@ apt_source "ubuntugis-unstable" do
 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"
+  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
+  key "B1275EA3"
 end
 
 apt_source "hwraid" do
@@ -89,7 +94,7 @@ end
 
 apt_source "logstash" do
   template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  url "http://packages.elasticsearch.org/logstash/2.3/debian"
   key "D88E42B4"
 end
 
@@ -104,13 +109,36 @@ apt_source "passenger" do
   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
+
+apt_source "mediawiki" do
+  template "mediawiki.list.erb"
+  url "https://releases.wikimedia.org/debian"
+  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+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