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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index cc6e47069..0bbe8ea94 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,16 +17,26 @@
 # limitations under the License.
 #
 
-package "apt"
-package "update-notifier-common"
+package %w[
+  apt
+  apt-transport-https
+  gnupg
+  update-notifier-common
+]
 
 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]
@@ -41,91 +51,114 @@ 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 "C3173AA6"
-  end
+repository_actions = Hash.new do |_, repository|
+  node[:apt][:sources].include?(repository) ? :add : :remove
+end
+
+apt_repository "brightbox-ruby-ng" do
+  action repository_actions["brightbox-ruby-ng"]
+  uri "ppa:brightbox/ruby-ng"
+end
+
+apt_repository "ubuntugis-stable" do
+  action repository_actions["ubuntugis-stable"]
+  uri "ppa:ubuntugis/ppa"
+end
+
+apt_repository "ubuntugis-unstable" do
+  action repository_actions["ubuntugis-unstable"]
+  uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
-apt_source "ubuntugis-stable" do
-  url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
-  key "314DF160"
+apt_repository "maxmind" do
+  action repository_actions["maxmind"]
+  uri "ppa:maxmind/ppa"
 end
 
-apt_source "ubuntugis-unstable" do
-  url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu"
-  key "314DF160"
+apt_repository "openstreetmap" do
+  action repository_actions["openstreetmap"]
+  uri "ppa:osmadmins/ppa"
 end
 
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
+apt_repository "squid2" do
+  action repository_actions["squid2"]
+  uri "ppa:osmadmins/squid2"
 end
 
-apt_source "management-component-pack" do
-  template "hp.list.erb"
-  url "http://downloads.linux.hpe.com/SDR/repo/mcp"
-  key "B1275EA3"
+apt_repository "squid3" do
+  action repository_actions["squid3"]
+  uri "ppa:osmadmins/squid3"
 end
 
-apt_source "hwraid" do
-  template "hwraid.list.erb"
-  url "http://hwraid.le-vert.net/ubuntu"
-  key "23B3D3B4"
+apt_repository "squid4" do
+  action repository_actions["squid4"]
+  uri "ppa:osmadmins/squid4"
 end
 
-apt_source "mapnik-v210" do
-  url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu"
-  key "5D50B6BA"
+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 "nginx" do
-  template "nginx.list.erb"
-  url "http://nginx.org/packages/ubuntu"
-  key "7BD9BF62"
+apt_repository "hwraid" do
+  action repository_actions["hwraid"]
+  uri "https://hwraid.le-vert.net/ubuntu"
+  distribution "precise"
+  components ["main"]
+  key "6005210E23B3D3B4"
 end
 
-apt_source "elasticsearch" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
-  key "D88E42B4"
+apt_repository "nginx" do
+  action repository_actions["nginx"]
+  arch "amd64"
+  uri "https://nginx.org/packages/ubuntu"
+  components ["nginx"]
+  key "ABF5BD827BD9BF62"
 end
 
-apt_source "logstash" do
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstash/2.3/debian"
-  key "D88E42B4"
+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
-  template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstashforwarder/debian"
-  key "D88E42B4"
+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"
-  key "AC40B2F7"
+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
-  template "postgresql.list.erb"
-  url "http://apt.postgresql.org/pub/repos/apt"
-  key "ACCC4CF8"
+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
-  template "mediawiki.list.erb"
-  url "https://releases.wikimedia.org/debian"
-  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+apt_repository "mediawiki" do
+  action repository_actions["mediawiki"]
+  uri "https://releases.wikimedia.org/debian"
+  distribution "jessie-mediawiki"
+  components ["main"]
+  key "AF380A3036A03444"
 end
 
 package "unattended-upgrades"