Enable osmadmins PPA for trusty

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index b1e5825ebf5e0cc26bfb7099092f5bbcc84c379b..659e06536b6ba13ef159f11e3b3cd406264f9c22 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -57,12 +57,10 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
   key "314DF160"
 end
 

-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
+apt_source "openstreetmap" do
+  template "openstreetmap.list.erb"
+  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+  key "0AC4F2CB"

 end
 
 apt_source "management-component-pack" do
 end
 
 apt_source "management-component-pack" do

diff --git a/cookbooks/apt/templates/default/openstreetmap.list.erb b/cookbooks/apt/templates/default/openstreetmap.list.erb
index 211e6b9b82acd6ee3cb250b016444a3695c99833..63664abd15b37a44ef15fe1df793a8f0fb61b322 100644 (file)
--- a/cookbooks/apt/templates/default/openstreetmap.list.erb
+++ b/cookbooks/apt/templates/default/openstreetmap.list.erb
@@ -1,4 +1,9 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # 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
 deb <%= @url %> precise main
 deb-src <%= @url %> precise main

+<% else -%>
+deb <%= @url %> trusty main
+deb-src <%= @url %> trusty main
+<% end -%>