X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=lib%2Fpuppet%2Ftype%2Fapt_key.rb;h=81b66a263862fa5bed5895c633865173469d09b5;hb=249a6d586279ab96ffa8f645dcdd0e44210fd4e6;hp=8aae686816577ac3b167ca7b19d9325cd1e2017a;hpb=0f3bdcdf5a44315197ded803401b52dfcce38ebe;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb index 8aae686..81b66a2 100644 --- a/lib/puppet/type/apt_key.rb +++ b/lib/puppet/type/apt_key.rb @@ -23,6 +23,9 @@ Puppet::Type.newtype(:apt_key) do if self[:content] and self[:source] fail('The properties content and source are mutually exclusive.') end + if self[:id].length < 40 + warning('The id should be a full fingerprint (40 characters), see README.') + end end newparam(:id, :namevar => true) do @@ -58,7 +61,7 @@ Puppet::Type.newtype(:apt_key) do newparam(:server) do desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.' defaultto :'keyserver.ubuntu.com' - + newvalues(/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/) end