X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fkey.pp;h=8d3bcf045c58f59df310046853e646b0c538191a;hb=5d96da0c6aac8f0f9192fe6ce63548bdaee149b5;hp=9ccbfcb6bbf6990a426f8664904a134f407fcc4f;hpb=7492f375fe3ea625e71673eaddcd1e11f06aca40;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/key.pp b/manifests/key.pp index 9ccbfcb..8d3bcf0 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -39,7 +39,8 @@ # [*key_server*] # _default_: +undef+ # -# The keyserver from where to fetch our GPG key. It defaults to +# The keyserver from where to fetch our GPG key. It can either be a domain +# name or url. It defaults to # undef which results in apt_key's default keyserver being used, # currently +keyserver.ubuntu.com+. # @@ -68,9 +69,7 @@ define apt::key ( } if $key_server { - if !is_domain_name($key_server) { - fail('$key_server must be a valid domain name') - } + validate_re($key_server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,4})?$']) } if $key_options {