X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..55c8e16ebbefa2bb557b49c78275ff61cf6ac703:/cookbooks/apt/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 24b425e8a..fe79213c0 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,20 +20,23 @@
 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
 
-execute "apt-update" do
+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
-  command "/usr/bin/apt-get update"
 end
 
 archive_host = if node[:country]
@@ -48,105 +51,122 @@ template "/etc/apt/sources.list" do
   group "root"
   mode 0o644
   variables :archive_host => archive_host, :codename => node[:lsb][:codename]
-  notifies :run, "execute[apt-update]", :immediately
+  notifies :update, "apt_update[/etc/apt/sources.list]", :immediately
 end
 
-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 "F5DA5F09C3173AA6"
-  end
+repository_actions = Hash.new do |_, repository|
+  node[:apt][:sources].include?(repository) ? :add : :remove
 end
 
-apt_source "ubuntugis-stable" do
-  url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
-  key "089EBE08314DF160"
+apt_repository "brightbox-ruby-ng" do
+  action repository_actions["brightbox-ruby-ng"]
+  uri "ppa:brightbox/ruby-ng"
 end
 
-apt_source "ubuntugis-unstable" do
-  url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu"
-  key "089EBE08314DF160"
+apt_repository "ubuntugis-stable" do
+  action repository_actions["ubuntugis-stable"]
+  uri "ppa:ubuntugis/ppa"
 end
 
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "D57F48750AC4F2CB"
-  update true
+apt_repository "ubuntugis-unstable" do
+  action repository_actions["ubuntugis-unstable"]
+  uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
-apt_source "management-component-pack" do
-  source_template "hp.list.erb"
-  url "https://downloads.linux.hpe.com/SDR/repo/mcp"
-  key "C208ADDE26C2B797"
-  key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub"
+apt_repository "maxmind" do
+  action repository_actions["maxmind"]
+  uri "ppa:maxmind/ppa"
 end
 
-apt_source "hwraid" do
-  source_template "hwraid.list.erb"
-  url "https://hwraid.le-vert.net/ubuntu"
-  key "6005210E23B3D3B4"
+apt_repository "openstreetmap" do
+  action repository_actions["openstreetmap"]
+  uri "ppa:osmadmins/ppa"
 end
 
-apt_source "mapnik-v210" do
-  url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
-  key "4F7B93595D50B6BA"
+apt_repository "squid2" do
+  action repository_actions["squid2"]
+  uri "ppa:osmadmins/squid2"
 end
 
-apt_source "nginx" do
-  source_template "nginx.list.erb"
-  url "https://nginx.org/packages/ubuntu"
-  key "ABF5BD827BD9BF62"
+apt_repository "squid3" do
+  action repository_actions["squid3"]
+  uri "ppa:osmadmins/squid3"
 end
 
-apt_source "elasticsearch1.7" do
-  source_template "elasticsearch.list.erb"
-  url "https://packages.elasticsearch.org/elasticsearch/1.7/debian"
-  key "D27D666CD88E42B4"
+apt_repository "squid4" do
+  action repository_actions["squid4"]
+  uri "ppa:osmadmins/squid4"
 end
 
-apt_source "elasticsearch2.x" do
-  source_template "elasticsearch.list.erb"
-  url "https://packages.elasticsearch.org/elasticsearch/2.x/debian"
-  key "D27D666CD88E42B4"
+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"
+  components ["non-free"]
+  key "C208ADDE26C2B797"
 end
 
-apt_source "elasticsearch5.x" do
-  source_template "elasticsearch.list.erb"
-  url "https://artifacts.elastic.co/packages/5.x/apt"
-  key "D27D666CD88E42B4"
+apt_repository "hwraid" do
+  action repository_actions["hwraid"]
+  uri "https://hwraid.le-vert.net/ubuntu"
+  distribution "precise"
+  components ["main"]
+  key "6005210E23B3D3B4"
 end
 
-apt_source "logstash" do
-  source_template "elasticsearch.list.erb"
-  url "https://packages.elasticsearch.org/logstash/2.3/debian"
+apt_repository "nginx" do
+  action repository_actions["nginx"]
+  arch "amd64"
+  uri "https://nginx.org/packages/ubuntu"
+  components ["nginx"]
+  key "ABF5BD827BD9BF62"
+end
+
+apt_repository "elasticsearch5.x" do
+  action repository_actions["elasticsearch5.x"]
+  uri "https://artifacts.elastic.co/packages/5.x/apt"
+  distribution "stable"
+  components ["main"]
   key "D27D666CD88E42B4"
 end
 
-apt_source "logstash-forwarder" do
-  source_template "elasticsearch.list.erb"
-  url "https://packages.elasticsearch.org/logstashforwarder/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"
 end
 
-apt_source "passenger" do
-  url "https://oss-binaries.phusionpassenger.com/apt/passenger"
+apt_repository "passenger" do
+  action repository_actions["passenger"]
+  uri "https://oss-binaries.phusionpassenger.com/apt/passenger"
+  components ["main"]
   key "561F9B9CAC40B2F7"
 end
 
-apt_source "postgresql" do
-  source_template "postgresql.list.erb"
-  url "https://apt.postgresql.org/pub/repos/apt"
+apt_repository "postgresql" do
+  action repository_actions["postgresql"]
+  uri "https://apt.postgresql.org/pub/repos/apt"
+  distribution "#{node[:lsb][:codename]}-pgdg"
+  components ["main"]
   key "7FCC7D46ACCC4CF8"
 end
 
-apt_source "mediawiki" do
-  source_template "mediawiki.list.erb"
-  url "https://releases.wikimedia.org/debian"
-  key "90E9F83F22250DD7"
+apt_repository "mediawiki" do
+  action repository_actions["mediawiki"]
+  uri "https://releases.wikimedia.org/debian"
+  distribution "jessie-mediawiki"
+  components ["main"]
+  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"