X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6157bab7abeae44abae9b58f7358779a86ad6437..HEAD:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 7fe4d800a..9627bf4d4 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,122 +17,77 @@ # limitations under the License. # -package "apt" -package "gnupg-curl" -package "update-notifier-common" +package %w[ + apt + apt-transport-https + gnupg +] + +package "update-notifier-common" if platform?("ubuntu") file "/etc/motd.tail" do action :delete end -execute "apt-update" do - action :nothing - command "/usr/bin/apt-get update" -end - -archive_host = if node[:country] - "#{node[:country]}.archive.ubuntu.com" - else - "archive.ubuntu.com" - end - -template "/etc/apt/sources.list" do - source "sources.list.erb" - owner "root" - group "root" - mode 0o644 - variables :archive_host => archive_host, :codename => node[:lsb][:codename] - notifies :run, "execute[apt-update]", :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 -end - -apt_source "ubuntugis-stable" do - url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu" - key "089EBE08314DF160" -end - -apt_source "ubuntugis-unstable" do - url "http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu" - key "089EBE08314DF160" -end - -apt_source "openstreetmap" do - url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu" - key "D57F48750AC4F2CB" -end - -apt_source "management-component-pack" do - template "hp.list.erb" - url "http://downloads.linux.hpe.com/SDR/repo/mcp" - key "C208ADDE26C2B797" - key_url "https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub" -end - -apt_source "hwraid" do - template "hwraid.list.erb" - url "http://hwraid.le-vert.net/ubuntu" - key "6005210E23B3D3B4" -end - -apt_source "mapnik-v210" do - url "http://ppa.launchpad.net/mapnik/v2.1.0/ubuntu" - key "4F7B93595D50B6BA" -end - -apt_source "nginx" do - template "nginx.list.erb" - url "http://nginx.org/packages/ubuntu" - key "ABF5BD827BD9BF62" -end - -apt_source "elasticsearch" do - template "elasticsearch.list.erb" - url "http://packages.elasticsearch.org/elasticsearch/1.7/debian" - key "D27D666CD88E42B4" -end - -apt_source "logstash" do - template "elasticsearch.list.erb" - url "http://packages.elasticsearch.org/logstash/2.3/debian" - key "D27D666CD88E42B4" +# FIXME: cleanup old package pin method for cciss-vol-status +file "/etc/apt/preferences.d/99-chef" do + action :delete end -apt_source "logstash-forwarder" do - template "elasticsearch.list.erb" - url "http://packages.elasticsearch.org/logstashforwarder/debian" - key "D27D666CD88E42B4" +apt_preference "cciss-vol-status" do + pin "origin *.ubuntu.com" + pin_priority "1100" end -apt_source "passenger" do - url "https://oss-binaries.phusionpassenger.com/apt/passenger" - key "561F9B9CAC40B2F7" +apt_update "/etc/apt/sources.list" do + action :nothing end -apt_source "postgresql" do - template "postgresql.list.erb" - url "http://apt.postgresql.org/pub/repos/apt" - key "7FCC7D46ACCC4CF8" +if platform?("debian") + archive_host = "deb.debian.org" + archive_security_host = archive_host + archive_distro = "debian" + archive_security_distro = "debian-security" + archive_suites = %w[main updates backports security] + archive_components = %w[main contrib non-free non-free-firmware] +elsif intel? + archive_host = if node[:country] + "#{node[:country]}.archive.ubuntu.com" + else + "archive.ubuntu.com" + end + archive_security_host = "security.ubuntu.com" + archive_distro = "ubuntu" + archive_security_distro = archive_distro + archive_suites = %w[main updates backports security] + archive_components = %w[main restricted universe multiverse] +else + archive_host = "ports.ubuntu.com" + archive_security_host = archive_host + archive_distro = "ubuntu-ports" + archive_security_distro = archive_distro + archive_suites = %w[main updates backports security] + archive_components = %w[main restricted universe multiverse] end -apt_source "mediawiki" do - template "mediawiki.list.erb" - url "https://releases.wikimedia.org/debian" - key "90E9F83F22250DD7" +template "/etc/apt/sources.list" do + source "sources.list.erb" + owner "root" + group "root" + mode "644" + variables :archive_host => archive_host, + :archive_security_host => archive_security_host, + :archive_distro => archive_distro, + :archive_security_distro => archive_security_distro, + :archive_suites => archive_suites, + :archive_components => archive_components, + :codename => node[:lsb][:codename] + notifies :update, "apt_update[/etc/apt/sources.list]", :immediately end -apt_source "openstreetmap-cgimap" do - url "http://ppa.launchpad.net/zerebubuth/openstreetmap-cgimap/ubuntu" - key "CDADED50" +apt_repository "openstreetmap" do + uri "ppa:osmadmins/ppa" + only_if { platform?("ubuntu") } end package "unattended-upgrades" @@ -147,7 +102,7 @@ if Dir.exist?("/usr/share/unattended-upgrades") file "/etc/apt/apt.conf.d/20auto-upgrades" do user "root" group "root" - mode 0o644 + mode "644" content auto_upgrades end end @@ -156,5 +111,5 @@ template "/etc/apt/apt.conf.d/60chef" do source "apt.conf.erb" owner "root" group "root" - mode 0o644 + mode "644" end