From 350370363ec2d12207142324d582345ae02c20f1 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 19 Oct 2018 16:11:08 -0400 Subject: [PATCH] (MODULES-8081): mention hkps:// protocol in key.pp and s/and/&&/ in apt_key_provider_spec.rb --- manifests/key.pp | 4 ++-- spec/acceptance/apt_key_provider_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/key.pp b/manifests/key.pp index 474ca39..13b4770 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -26,8 +26,8 @@ # an absolute path. # # @param server -# Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or -# hkp://). +# Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, +# hkp:// or hkps://). The hkps:// protocol is currently only supported on Ubuntu 18.04. # # @param options # Passes additional options to `apt-key adv --keyserver-options`. diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb index b43dc15..219983c 100644 --- a/spec/acceptance/apt_key_provider_spec.rb +++ b/spec/acceptance/apt_key_provider_spec.rb @@ -478,7 +478,7 @@ hkp_pool_pp = <<-MANIFEST } MANIFEST -if fact('operatingsystem') =~ %r{Ubuntu} and fact('operatingsystemrelease') =~ %r{^18\.04} +if fact('operatingsystem') =~ %r{Ubuntu} && fact('operatingsystemrelease') =~ %r{^18\.04} hkps_protocol_supported = true else hkps_protocol_supported = false -- 2.32.3