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
Merge pull request #679 from arioch/fix_typo
[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..72f3c87c5b35705ae963e39244f7e4b44d9f661a 100644
(file)
--- a/
lib/puppet/type/apt_key.rb
+++ b/
lib/puppet/type/apt_key.rb
@@
-7,7
+7,7
@@
Puppet::Type.newtype(:apt_key) do
by apt to perform package validation. Apt has it's own GPG keyring that can
be manipulated through the `apt-key` command.
by apt to perform package validation. Apt has it's own GPG keyring that can
be manipulated through the `apt-key` command.
- apt_key { '
4BD6EC30
':
+ apt_key { '
6F6B15509CF8E59E6E469F327F438280EF8D349F
':
source => 'http://apt.puppetlabs.com/pubkey.gpg'
}
source => 'http://apt.puppetlabs.com/pubkey.gpg'
}
@@
-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