Use default template for osmadmins PPA
authorTom Hughes <tom@compton.nu>
Tue, 17 May 2016 23:18:15 +0000 (00:18 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 17 May 2016 23:18:15 +0000 (00:18 +0100)
cookbooks/apt/recipes/default.rb
cookbooks/apt/templates/default/openstreetmap.list.erb [deleted file]

index e0e000c..4874d15 100644 (file)
@@ -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 (file)
index 63664ab..0000000
+++ /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 -%>