X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e0288536f101ddeef1bb700fa26388a5a6b30608..cac6ace6749429cdc77d0f1c0bac4890838d0861:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 3a660527d..99092214d 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.
@@ -28,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
@@ -66,6 +73,16 @@ apt_repository "ubuntugis-unstable" do
   uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
+apt_repository "git-core" do
+  action repository_actions["git-core"]
+  uri "ppa:git-core/ppa"
+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"
@@ -81,10 +98,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-gen9"
+  distribution "bionic/current-gen9"
   components ["non-free"]
   key "C208ADDE26C2B797"
 end
@@ -141,7 +163,15 @@ apt_repository "mediawiki" do
   uri "https://releases.wikimedia.org/debian"
   distribution "jessie-mediawiki"
   components ["main"]
-  key "90E9F83F22250DD7"
+  key "AF380A3036A03444"
+end
+
+apt_repository "docker" do
+  action repository_actions["docker"]
+  uri "https://download.docker.com/linux/ubuntu"
+  arch "amd64"
+  components ["stable"]
+  key "https://download.docker.com/linux/ubuntu/gpg"
 end
 
 package "unattended-upgrades"