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
backports: Add support back for backports.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index ce5fc2514cee6c27d32be04cd0cdaf3f47dac359..6761e6912d31a253fd969c0dd4c5a48d8679e964 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-7,7
+7,7
@@
#
# === Parameters
#
#
# === Parameters
#
-# [*
key
*]
+# [*
id
*]
# _default_: +$title+, the title/name of the resource
#
# Is a GPG key ID or full key fingerprint. This value is validated with
# _default_: +$title+, the title/name of the resource
#
# Is a GPG key ID or full key fingerprint. This value is validated with
@@
-23,14
+23,14
@@
# * +present+
# * +absent+
#
# * +present+
# * +absent+
#
-# [*
key_
content*]
+# [*content*]
# _default_: +undef+
#
# This parameter can be used to pass in a GPG key as a
# string in case it cannot be fetched from a remote location
# and using a file resource is for other reasons inconvenient.
#
# _default_: +undef+
#
# This parameter can be used to pass in a GPG key as a
# string in case it cannot be fetched from a remote location
# and using a file resource is for other reasons inconvenient.
#
-# [*
key_
source*]
+# [*source*]
# _default_: +undef+
#
# This parameter can be used to pass in the location of a GPG
# _default_: +undef+
#
# This parameter can be used to pass in the location of a GPG
@@
-38,80
+38,78
@@
# * +URL+: ftp, http or https
# * +path+: absolute path to a file on the target system.
#
# * +URL+: ftp, http or https
# * +path+: absolute path to a file on the target system.
#
-# [*
key_
server*]
+# [*server*]
# _default_: +undef+
#
# The keyserver from where to fetch our GPG key. It can either be a domain
# _default_: +undef+
#
# 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+.
+# name or url. It defaults to +keyserver.ubuntu.com+.
#
#
-# [*
key_
options*]
+# [*options*]
# _default_: +undef+
#
# Additional options to pass on to `apt-key adv --keyserver-options`.
define apt::key (
# _default_: +undef+
#
# Additional options to pass on to `apt-key adv --keyserver-options`.
define apt::key (
- $
key
= $title,
- $ensure
= present,
- $
key_
content = undef,
- $
key_
source = undef,
- $
key_server = undef
,
- $
key_
options = undef,
+ $
id
= $title,
+ $ensure = present,
+ $content = undef,
+ $source = undef,
+ $
server = $::apt::keyserver
,
+ $options = undef,
) {
) {
- validate_re($
key
, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
+ validate_re($
id
, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
validate_re($ensure, ['\Aabsent|present\Z',])
validate_re($ensure, ['\Aabsent|present\Z',])
- if $
key_
content {
- validate_string($
key_
content)
+ if $content {
+ validate_string($content)
}
}
- if $
key_
source {
- validate_re($
key_
source, ['\Ahttps?:\/\/', '\Aftp:\/\/', '\A\/\w+'])
+ if $source {
+ validate_re($source, ['\Ahttps?:\/\/', '\Aftp:\/\/', '\A\/\w+'])
}
}
- if $
key_
server {
- validate_re($
key_
server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$'])
+ if $server {
+ validate_re($server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$'])
}
}
- if $
key_
options {
- validate_string($
key_
options)
+ if $options {
+ validate_string($options)
}
case $ensure {
present: {
}
case $ensure {
present: {
- if defined(Anchor["apt_key ${
key
} absent"]){
- fail("key with id ${
key
} already ensured as absent")
+ if defined(Anchor["apt_key ${
id
} absent"]){
+ fail("key with id ${
id
} already ensured as absent")
}
}
- if !defined(Anchor["apt_key ${
key
} present"]) {
+ if !defined(Anchor["apt_key ${
id
} present"]) {
apt_key { $title:
apt_key { $title:
- ensure
=> $ensure,
- id
=> $key
,
- source
=> $key_
source,
- content
=> $key_
content,
- server
=> $key_
server,
-
keyserver_options => $key_
options,
+ ensure => $ensure,
+ id
=> $id
,
+ source
=> $
source,
+ content
=> $
content,
+ server
=> $
server,
+
options => $
options,
} ->
} ->
- anchor { "apt_key ${
key
} present": }
+ anchor { "apt_key ${
id
} present": }
}
}
absent: {
}
}
absent: {
- if defined(Anchor["apt_key ${
key
} present"]){
- fail("key with id ${
key
} already ensured as present")
+ if defined(Anchor["apt_key ${
id
} present"]){
+ fail("key with id ${
id
} already ensured as present")
}
}
- if !defined(Anchor["apt_key ${
key
} absent"]){
+ if !defined(Anchor["apt_key ${
id
} absent"]){
apt_key { $title:
apt_key { $title:
- ensure
=> $ensure,
- id
=> $key
,
- source
=> $key_
source,
- content
=> $key_
content,
- server
=> $key_
server,
-
keyserver_options => $key_
options,
+ ensure => $ensure,
+ id
=> $id
,
+ source
=> $
source,
+ content
=> $
content,
+ server
=> $
server,
+
options => $
options,
} ->
} ->
- anchor { "apt_key ${
key
} absent": }
+ anchor { "apt_key ${
id
} absent": }
}
}
}
}