X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6268f461956863e0838b52b8342e1ec57aec8226..ac0b810811c4994caa199827c26b7ee9ce8def11:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 6f36c099d..74766e6e8 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,11 +30,18 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
+archive_host = if node[:country]
+                 "#{node[:country]}.archive.ubuntu.com"
+               else
+                 "archive.ubuntu.com"
+               end
+
 template "/etc/apt/sources.list" do
   source "sources.list.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
+  variables :archive_host => archive_host, :codename => node[:lsb][:codename]
   notifies :run, "execute[apt-update]", :immediately
 end
 
@@ -44,101 +52,104 @@ if node[:lsb][:release].to_f >= 16.04
 else
   apt_source "brightbox-ruby-ng" do
     url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
-    key "C3173AA6"
+    key "F5DA5F09C3173AA6"
   end
 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"
-  key "314DF160"
+  key "089EBE08314DF160"
 end
 
 apt_source "openstreetmap" do
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
+  key "D57F48750AC4F2CB"
 end
 
 apt_source "management-component-pack" do
   template "hp.list.erb"
   url "http://downloads.linux.hpe.com/SDR/repo/mcp"
-  key "B1275EA3"
+  key "C208ADDE26C2B797"
+  key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub"
 end
 
 apt_source "hwraid" do
   template "hwraid.list.erb"
   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"
-  key "5D50B6BA"
+  key "4F7B93595D50B6BA"
 end
 
 apt_source "nginx" do
   template "nginx.list.erb"
   url "http://nginx.org/packages/ubuntu"
-  key "7BD9BF62"
+  key "ABF5BD827BD9BF62"
 end
 
 apt_source "elasticsearch" do
   template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
-  key "D88E42B4"
+  key "D27D666CD88E42B4"
 end
 
 apt_source "logstash" do
   template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/logstash/2.3/debian"
-  key "D88E42B4"
+  key "D27D666CD88E42B4"
 end
 
 apt_source "logstash-forwarder" do
   template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/logstashforwarder/debian"
-  key "D88E42B4"
+  key "D27D666CD88E42B4"
 end
 
 apt_source "passenger" do
   url "https://oss-binaries.phusionpassenger.com/apt/passenger"
-  key "AC40B2F7"
+  key "561F9B9CAC40B2F7"
 end
 
 apt_source "postgresql" do
   template "postgresql.list.erb"
   url "http://apt.postgresql.org/pub/repos/apt"
-  key "ACCC4CF8"
+  key "7FCC7D46ACCC4CF8"
 end
 
 apt_source "mediawiki" do
   template "mediawiki.list.erb"
   url "https://releases.wikimedia.org/debian"
-  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+  key "90E9F83F22250DD7"
 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
+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 0644
+  mode 0o644
 end