From: Tom Hughes <tom@compton.nu>
Date: Thu, 7 Jun 2018 14:02:46 +0000 (+0100)
Subject: Don't require gnupg-curl on Ubuntu 18.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a040a379c89649bc38b9513d095de1d3b1ea536e

Don't require gnupg-curl on Ubuntu 18.04
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 3cc26880e..24b425e8a 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -20,10 +20,13 @@
 package %w[
   apt
   apt-transport-https
-  gnupg-curl
   update-notifier-common
 ]
 
+if node[:lsb][:release].to_f < 18.04
+  package "gnupg-curl"
+end
+
 file "/etc/motd.tail" do
   action :delete
 end