From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Dec 2014 09:33:02 +0000 (+0000)
Subject: Enable osmadmins PPA for trusty
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/eae50fd446d7fc41ab1f96ad94925e6a5cdb95b2?ds=sidebyside

Enable osmadmins PPA for trusty
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index b1e5825eb..659e06536 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -57,12 +57,10 @@ apt_source "ubuntugis-unstable" do
   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
diff --git a/cookbooks/apt/templates/default/openstreetmap.list.erb b/cookbooks/apt/templates/default/openstreetmap.list.erb
index 211e6b9b8..63664abd1 100644
--- 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
 
+<% 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 -%>