X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6df5d7a48406b20d84497d2df79b47bde9c86257..0aaea8096fcdd565f0f1990a84ad68e9aeb90113:/cookbooks/apt/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 0d4a2d556..0bbe8ea94 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apt
+# Cookbook:: apt
 # Recipe:: default
 #
-# Copyright 2010, Tom Hughes
+# Copyright:: 2010, Tom Hughes
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 package %w[
   apt
   apt-transport-https
+  gnupg
   update-notifier-common
 ]
 
@@ -27,6 +28,13 @@ file "/etc/motd.tail" do
   action :delete
 end
 
+template "/etc/apt/preferences.d/99-chef" do
+  source "preferences.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
 apt_update "/etc/apt/sources.list" do
   action :nothing
 end
@@ -65,6 +73,11 @@ apt_repository "ubuntugis-unstable" do
   uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
+apt_repository "maxmind" do
+  action repository_actions["maxmind"]
+  uri "ppa:maxmind/ppa"
+end
+
 apt_repository "openstreetmap" do
   action repository_actions["openstreetmap"]
   uri "ppa:osmadmins/ppa"
@@ -80,10 +93,15 @@ apt_repository "squid3" do
   uri "ppa:osmadmins/squid3"
 end
 
+apt_repository "squid4" do
+  action repository_actions["squid4"]
+  uri "ppa:osmadmins/squid4"
+end
+
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
-  distribution "#{node[:lsb][:codename]}/current"
+  distribution "#{node[:lsb][:codename]}/current-gen9"
   components ["non-free"]
   key "C208ADDE26C2B797"
 end
@@ -140,7 +158,7 @@ apt_repository "mediawiki" do
   uri "https://releases.wikimedia.org/debian"
   distribution "jessie-mediawiki"
   components ["main"]
-  key "90E9F83F22250DD7"
+  key "AF380A3036A03444"
 end
 
 package "unattended-upgrades"