X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e3d069c5375bb660a0a9e18a035baa5e6536a942..03304582f8cbbb14d634498f9c31636452cdf532:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index d086ab85b..e3787470a 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -37,9 +37,15 @@ template "/etc/apt/sources.list" do notifies :run, "execute[apt-update]", :immediately end -apt_source "brightbox-ruby-ng" do - url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu" - key "C3173AA6" +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 end apt_source "ubuntugis-stable" do @@ -53,14 +59,13 @@ apt_source "ubuntugis-unstable" do end apt_source "openstreetmap" do - template "openstreetmap.list.erb" url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu" key "0AC4F2CB" end apt_source "management-component-pack" do template "hp.list.erb" - url "http://downloads.linux.hp.com/SDR/downloads/ManagementComponentPack" + url "http://downloads.linux.hpe.com/SDR/repo/mcp" key "B1275EA3" end