X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..df33b14ad1e5006b407f469379fc1b7e71bc475b:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 24b425e8a..c92865b55 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,133 +20,53 @@ package %w[ apt apt-transport-https + gnupg update-notifier-common ] -if node[:lsb][:release].to_f < 18.04 - package "gnupg-curl" +file "/etc/motd.tail" do + action :delete end -file "/etc/motd.tail" do +# FIXME: cleanup old package pin method for cciss-vol-status +file "/etc/apt/preferences.d/99-chef" do action :delete end -execute "apt-update" do +apt_preference "cciss-vol-status" do + pin "origin *.ubuntu.com" + pin_priority "1100" +end + +apt_update "/etc/apt/sources.list" 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 +if 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" +else + archive_host = "ports.ubuntu.com" + archive_security_host = archive_host + archive_distro = "ubuntu-ports" +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" - update true -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" -end - -apt_source "hwraid" do - source_template "hwraid.list.erb" - url "https://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 - source_template "nginx.list.erb" - url "https://nginx.org/packages/ubuntu" - key "ABF5BD827BD9BF62" -end - -apt_source "elasticsearch1.7" do - source_template "elasticsearch.list.erb" - url "https://packages.elasticsearch.org/elasticsearch/1.7/debian" - key "D27D666CD88E42B4" -end - -apt_source "elasticsearch2.x" do - source_template "elasticsearch.list.erb" - url "https://packages.elasticsearch.org/elasticsearch/2.x/debian" - key "D27D666CD88E42B4" -end - -apt_source "elasticsearch5.x" do - source_template "elasticsearch.list.erb" - url "https://artifacts.elastic.co/packages/5.x/apt" - key "D27D666CD88E42B4" -end - -apt_source "logstash" do - source_template "elasticsearch.list.erb" - url "https://packages.elasticsearch.org/logstash/2.3/debian" - key "D27D666CD88E42B4" -end - -apt_source "logstash-forwarder" do - source_template "elasticsearch.list.erb" - url "https://packages.elasticsearch.org/logstashforwarder/debian" - key "D27D666CD88E42B4" -end - -apt_source "passenger" do - url "https://oss-binaries.phusionpassenger.com/apt/passenger" - key "561F9B9CAC40B2F7" -end - -apt_source "postgresql" do - source_template "postgresql.list.erb" - url "https://apt.postgresql.org/pub/repos/apt" - key "7FCC7D46ACCC4CF8" + mode "644" + variables :archive_host => archive_host, :archive_security_host => archive_security_host, :archive_distro => archive_distro, :codename => node[:lsb][:codename] + notifies :update, "apt_update[/etc/apt/sources.list]", :immediately end -apt_source "mediawiki" do - source_template "mediawiki.list.erb" - url "https://releases.wikimedia.org/debian" - key "90E9F83F22250DD7" +apt_repository "openstreetmap" do + uri "ppa:osmadmins/ppa" end package "unattended-upgrades" @@ -161,7 +81,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 @@ -170,5 +90,5 @@ template "/etc/apt/apt.conf.d/60chef" do source "apt.conf.erb" owner "root" group "root" - mode 0o644 + mode "644" end