From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Dec 2014 14:27:44 +0000 (+0000)
Subject: Install osmadmins repo on quantal
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f3b1617008c17e80dbc15af4b1bb8c7d03a4799e

Install osmadmins repo on quantal
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 013c5bc34..b1e5825eb 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -57,8 +57,9 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-if node[:lsb][:release].to_f == 12.04
+if node[:lsb][:release].to_f == 12.04 || node[:lsb][:release].to_f == 12.10
   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
new file mode 100644
index 000000000..211e6b9b8
--- /dev/null
+++ b/cookbooks/apt/templates/default/openstreetmap.list.erb
@@ -0,0 +1,4 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+deb <%= @url %> precise main
+deb-src <%= @url %> precise main