Don't use the brightbox ruby repo on Ubuntu 16.04

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index b1e5825ebf5e0cc26bfb7099092f5bbcc84c379b..e3787470a454b4cd13ade0f840d32fbc4c36bf9a 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,22 +29,23 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
   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
 template "/etc/apt/sources.list" do

-  source sources_template
+  source "sources.list.erb"

   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

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

 end
 
 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
 end
 
 apt_source "ubuntugis-stable" do


@@ -57,18 +58,15 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
   key "314DF160"
 end
 

-if node[:lsb][:release].to_f == 12.04 || node[:lsb][:release].to_f == 12.10
-  apt_source "openstreetmap" do
-    template "openstreetmap.list.erb"
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
+apt_source "openstreetmap" do
+  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+  key "0AC4F2CB"

 end
 
 apt_source "management-component-pack" do
   template "hp.list.erb"
 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
 end
 
 apt_source "hwraid" do


@@ -90,7 +88,19 @@ 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.7/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash-forwarder" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"

   key "D88E42B4"
 end
 
   key "D88E42B4"
 end
 


@@ -98,3 +108,37 @@ 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 "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