Install osmadmins repo on quantal

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 013c5bc34f5cfa9d7730703fa187813430632d70..b1e5825ebf5e0cc26bfb7099092f5bbcc84c379b 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -57,8 +57,9 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
   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
   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
new file mode 100644 (file)
index 0000000..211e6b9
--- /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