Use default template for osmadmins PPA

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index e0e000c3a240dc2b222aad67cd81b6ec685318b6..4874d15fbd8a5a894d1f4b417ff2d7fa2d63c362 100644 (file)
--- 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
 end
 
 apt_source "openstreetmap" do

-  template "openstreetmap.list.erb"

   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "0AC4F2CB"
 end
   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 (file)
index 63664ab..0000000
--- 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 -%>