Sort ignored addresses

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 9c0b62ab7d61aa0a6b6d59177c09540cbfa34e50..06edb02a05afdece6beb2b4e68cb6dd106329066 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 package "apt"
 #
 
 package "apt"

+package "gnupg-curl"

 package "update-notifier-common"
 
 file "/etc/motd.tail" do
 package "update-notifier-common"
 
 file "/etc/motd.tail" do


@@ -29,91 +30,133 @@ 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
+archive_host = if node[:country]
+                 "#{node[:country]}.archive.ubuntu.com"
+               else
+                 "archive.ubuntu.com"
+               end

 
 template "/etc/apt/sources.list" do
 
 template "/etc/apt/sources.list" do

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

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0644
-  notifies :run, "execute[apt-update]"
-end
-
-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
-end
-
-apt_source "brightbox-ruby-ng" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
-  key "C3173AA6"
-end
-
-apt_source "brightbox-ruby-ng-experimental" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu-experimental"
-  key "C3173AA6"
+  mode 0o644
+  variables :archive_host => archive_host, :codename => node[:lsb][:codename]
+  notifies :run, "execute[apt-update]", :immediately

 end
 
 end
 

-apt_source "pitti-postgresql" do
-  url "http://ppa.launchpad.net/pitti/postgresql/ubuntu"
-  key "8683D8A2"
+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 "F5DA5F09C3173AA6"
+  end

 end
 
 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
 end
 
 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"

-  key "314DF160"
+  key "089EBE08314DF160"

 end
 
 apt_source "ubuntugis-unstable" do
   url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu"
 end
 
 apt_source "ubuntugis-unstable" do
   url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu"

-  key "314DF160"
-end
-
-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  key "8D0DC64F"
+  key "089EBE08314DF160"

 end
 
 end
 

-if node[:lsb][:release].to_f == 12.04
-  apt_source "openstreetmap" do
-    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-    key "0AC4F2CB"
-  end
+apt_source "openstreetmap" do
+  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+  key "D57F48750AC4F2CB"
+  update true

 end
 
 apt_source "management-component-pack" do
 end
 
 apt_source "management-component-pack" do

-  template "hp.list.erb"
-  url "http://downloads.linux.hp.com/SDR/downloads/ManagementComponentPack"
-  key "2689B887"
+  source_template "hp.list.erb"
+  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
+  key "C208ADDE26C2B797"
+  key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub"

 end
 
 apt_source "hwraid" do
 end
 
 apt_source "hwraid" do

-  template "hwraid.list.erb"
+  source_template "hwraid.list.erb"

   url "http://hwraid.le-vert.net/ubuntu"
   url "http://hwraid.le-vert.net/ubuntu"

-  key "23B3D3B4"
+  key "6005210E23B3D3B4"

 end
 
 apt_source "mapnik-v210" do
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
 end
 
 apt_source "mapnik-v210" do
   url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"

-  key "5D50B6BA"
+  key "4F7B93595D50B6BA"

 end
 
 apt_source "nginx" do
 end
 
 apt_source "nginx" do

-  template "nginx.list.erb"
+  source_template "nginx.list.erb"

   url "http://nginx.org/packages/ubuntu"
   url "http://nginx.org/packages/ubuntu"

-  key "7BD9BF62"
+  key "ABF5BD827BD9BF62"
+end
+
+apt_source "elasticsearch1.7" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
+  key "D27D666CD88E42B4"
+end
+
+apt_source "elasticsearch2.x" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/2.x/debian"
+  key "D27D666CD88E42B4"

 end
 
 end
 

-apt_source "elasticsearch" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/elasticsearch/1.0/debian"
-  key "D88E42B4"
+apt_source "logstash" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstash/2.3/debian"
+  key "D27D666CD88E42B4"
+end
+
+apt_source "logstash-forwarder" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"
+  key "D27D666CD88E42B4"

 end
 
 apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
 end
 
 apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"

-  key "AC40B2F7"
+  key "561F9B9CAC40B2F7"
+end
+
+apt_source "postgresql" do
+  source_template "postgresql.list.erb"
+  url "http://apt.postgresql.org/pub/repos/apt"
+  key "7FCC7D46ACCC4CF8"
+end
+
+apt_source "mediawiki" do
+  source_template "mediawiki.list.erb"
+  url "https://releases.wikimedia.org/debian"
+  key "90E9F83F22250DD7"
+end
+
+package "unattended-upgrades"
+
+if Dir.exist?("/usr/share/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 0o644
+    content auto_upgrades
+  end
+end
+
+template "/etc/apt/apt.conf.d/60chef" do
+  source "apt.conf.erb"
+  owner "root"
+  group "root"
+  mode 0o644

 end
 end