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
source: Support complex pin, like key does.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index 0f0572ed5f160c7483e3fd199c2fa9fedb087e05..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
@@
-42,24
+42,22
@@
# _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+.
#
# [*options*]
# _default_: +undef+
#
# Additional options to pass on to `apt-key adv --keyserver-options`.
define apt::key (
#
# [*options*]
# _default_: +undef+
#
# Additional options to pass on to `apt-key adv --keyserver-options`.
define apt::key (
- $
key
= $title,
+ $
id
= $title,
$ensure = present,
$content = undef,
$source = undef,
$ensure = present,
$content = undef,
$source = undef,
- $server =
undef
,
+ $server =
$::apt::keyserver
,
$options = undef,
) {
$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',])
if $content {
validate_re($ensure, ['\Aabsent|present\Z',])
if $content {
@@
-80,38
+78,38
@@
define apt::key (
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:
ensure => $ensure,
apt_key { $title:
ensure => $ensure,
- id => $
key
,
+ id => $
id
,
source => $source,
content => $content,
server => $server,
options => $options,
} ->
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:
ensure => $ensure,
apt_key { $title:
ensure => $ensure,
- id => $
key
,
+ id => $
id
,
source => $source,
content => $content,
server => $server,
options => $options,
} ->
source => $source,
content => $content,
server => $server,
options => $options,
} ->
- anchor { "apt_key ${
key
} absent": }
+ anchor { "apt_key ${
id
} absent": }
}
}
}
}