X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/388687b7120815bc61f49de6c5dd0ea793dad67b..94b26f4794c7ff6a16e956953e00f7bdd738080b:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 4282ba107..14e37dd9b 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -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 @@ -87,11 +91,7 @@ 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 +106,7 @@ end apt_repository "nginx" do action repository_actions["nginx"] + arch "amd64" uri "https://nginx.org/packages/ubuntu" components ["nginx"] key "ABF5BD827BD9BF62" @@ -119,9 +120,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"