From b65d8cebd4b510a38156965b6a4fce03cdcf36d9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 18 May 2016 00:18:15 +0100 Subject: [PATCH] Use default template for osmadmins PPA --- cookbooks/apt/recipes/default.rb | 1 - cookbooks/apt/templates/default/openstreetmap.list.erb | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 cookbooks/apt/templates/default/openstreetmap.list.erb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index e0e000c3a..4874d15fb 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -53,7 +53,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 diff --git a/cookbooks/apt/templates/default/openstreetmap.list.erb b/cookbooks/apt/templates/default/openstreetmap.list.erb deleted file mode 100644 index 63664abd1..000000000 --- a/cookbooks/apt/templates/default/openstreetmap.list.erb +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - -<% if node[:lsb][:release].to_f < 14.04 -%> -deb <%= @url %> precise main -deb-src <%= @url %> precise main -<% else -%> -deb <%= @url %> trusty main -deb-src <%= @url %> trusty main -<% end -%> -- 2.39.5