X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/07792d26bd85573e119b442074e7ba2091efd167..62e4ecb57749d4c45eeed2fc5e8bba1fac2f92bc:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 9c0b62ab7..2573990a5 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 package "apt"
+package "gnupg-curl"
 package "update-notifier-common"
 
 file "/etc/motd.tail" do
@@ -29,37 +30,30 @@ execute "apt-update" do
   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
-  source sources_template
+  source "sources.list.erb"
   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"
+  mode 0o644
+  variables :archive_host => archive_host, :codename => node[:lsb][:codename]
+  notifies :run, "execute[apt-update]", :immediately
 end
 
-apt_source "brightbox-ruby-ng-experimental" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu-experimental"
-  key "C3173AA6"
-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 "C3173AA6"
+  end
 end
 
 apt_source "ubuntugis-stable" do
@@ -72,22 +66,16 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  key "8D0DC64F"
-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 "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 "26C2B797"
+  key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub"
 end
 
 apt_source "hwraid" do
@@ -109,7 +97,19 @@ end
 
 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/2.3/debian"
+  key "D88E42B4"
+end
+
+apt_source "logstash-forwarder" do
+  template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/logstashforwarder/debian"
   key "D88E42B4"
 end
 
@@ -117,3 +117,39 @@ apt_source "passenger" do
   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"
+
+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