Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
apt_key now really works with userinfo for http(s)
[puppet-modules/puppetlabs-apt.git]
/
lib
/
puppet
/
type
/
apt_key.rb
diff --git
a/lib/puppet/type/apt_key.rb
b/lib/puppet/type/apt_key.rb
index 70825ac218c5bb286dc04219145eecf442803094..81b66a263862fa5bed5895c633865173469d09b5 100644
(file)
--- 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[: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
end
newparam(:id, :namevar => true) do
@@
-58,11
+61,11
@@
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'
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
newvalues(/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/)
end
- newparam(:
keyserver_
options) do
+ newparam(:options) do
desc 'Additional options to pass to apt-key\'s --keyserver-options.'
end
desc 'Additional options to pass to apt-key\'s --keyserver-options.'
end