X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7e72af6717778f869498e10adcd77404f06c0035..acf4c5db7bf1d1d8657e3500246da8848af4dffb:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4282ba107..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,17 +20,21 @@
 package %w[
   apt
   apt-transport-https
+  gnupg
   update-notifier-common
 ]
 
-if node[:lsb][:release].to_f < 18.04
-  package "gnupg-curl"
-end
-
 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
@@ -69,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"
@@ -84,14 +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"
-  if node[:lsb][:release].to_f >= 16.04
-    distribution "xenial/current"
-  else
-    distribution "#{node[:lsb][:codename]}/current"
-  end
+  distribution "#{node[:lsb][:codename]}/current-gen9"
   components ["non-free"]
   key "C208ADDE26C2B797"
 end
@@ -106,6 +116,7 @@ end
 
 apt_repository "nginx" do
   action repository_actions["nginx"]
+  arch "amd64"
   uri "https://nginx.org/packages/ubuntu"
   components ["nginx"]
   key "ABF5BD827BD9BF62"
@@ -119,9 +130,9 @@ apt_repository "elasticsearch5.x" do
   key "D27D666CD88E42B4"
 end
 
-apt_repository "logstash" do
-  action repository_actions["logstash"]
-  uri "https://packages.elasticsearch.org/logstash/2.3/debian"
+apt_repository "elasticsearch6.x" do
+  action repository_actions["elasticsearch6.x"]
+  uri "https://artifacts.elastic.co/packages/6.x/apt"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"
@@ -147,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"