From ad68d48eec22d48defaddd96e3841da23951c20e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 3 Jun 2014 00:55:23 +0100 Subject: [PATCH] Don't define osmadmins PPA on 14.04 --- cookbooks/apt/recipes/default.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 -- 2.43.2