From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Jun 2014 23:55:23 +0000 (+0100)
Subject: Don't define osmadmins PPA on 14.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ad68d48eec22d48defaddd96e3841da23951c20e

Don't define osmadmins PPA on 14.04
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 705e72c86..dea088bb6 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -72,9 +72,11 @@ apt_source "brianmercer-php" do
   key "8D0DC64F"
 end
 
-apt_source "openstreetmap" do
-  url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
-  key "0AC4F2CB"
+if node[:lsb][:release].to_f < 14.04
+  apt_source "openstreetmap" do
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end
 end
 
 apt_source "proliant-support-pack" do