X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0bbf2c3b8998e11330a2dbc1211b08a39c2ab3e5..911c341fc1a9c341fe1aadfcdf6ce32864180ae7:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index e0e000c3a..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,7 +59,6 @@ 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