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 #887 from puppetlabs/pdksync_encrypt-git
[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 ca88f867eab26918b43ad729dd29a7b53ec754e2..e543b96cb980a2d63bf197fddf2903e3b6ca5e54 100644
(file)
--- a/
lib/puppet/type/apt_key.rb
+++ b/
lib/puppet/type/apt_key.rb
@@
-64,15
+64,11
@@
Puppet::Type.newtype(:apt_key) do
end
end
end
end
- autorequire(:package) do
- 'dirmngr'
- end
-
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(%r{\A((hkp|hkps|http|https):
//)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})
?$})
+ newvalues(%r{\A((hkp|hkps|http|https):
\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_]+)*\/
?$})
end
newparam(:options) do
end
newparam(:options) do
@@
-84,6
+80,11
@@
Puppet::Type.newtype(:apt_key) do
defaultto false
end
defaultto false
end
+ newparam(:weak_ssl, boolean: true, parent: Puppet::Parameter::Boolean) do
+ desc 'When true and source uses https, accepts download of keys without SSL verfication'
+ defaultto false
+ end
+
newproperty(:fingerprint) do
desc <<-MANIFEST
The 40-digit hexadecimal fingerprint of the specified GPG key.
newproperty(:fingerprint) do
desc <<-MANIFEST
The 40-digit hexadecimal fingerprint of the specified GPG key.