From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 May 2016 23:18:15 +0000 (+0100)
Subject: Use default template for osmadmins PPA
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b65d8cebd4b510a38156965b6a4fce03cdcf36d9?hp=dbf7c55e6db5cfa92c0702bada70d4d9757fa39a

Use default template for osmadmins PPA
---

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 -%>