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 #60 from branan/ppa_filename
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index 63165f754666345f0a0355db42d61eaa13b1e007..037eec5288f789937ca492382064715df982034e 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-29,26
+29,27
@@
define apt::key (
case $ensure {
present: {
case $ensure {
present: {
- anchor { "apt::key/${title}":
;
}
+ anchor { "apt::key/${title}": }
- if defined(Exec["apt::key $
upkey
absent"]) {
- fail
("Cannot ensure Apt::Key[$upkey] present; $upkey
already ensured absent")
+ if defined(Exec["apt::key $
{upkey}
absent"]) {
+ fail
("Cannot ensure Apt::Key[${upkey}] present; ${upkey}
already ensured absent")
}
}
- if !defined(Anchor["apt::key $
upkey
present"]) {
- anchor { "apt::key $
upkey present":;
}
+ if !defined(Anchor["apt::key $
{upkey}
present"]) {
+ anchor { "apt::key $
{upkey} present":
}
}
if !defined(Exec[$digest]) {
}
if !defined(Exec[$digest]) {
+ $digest_command = $method ? {
+ 'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
+ 'source' => "wget -q '${key_source}' -O- | apt-key add -",
+ 'server' => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
+ }
exec { $digest:
path => '/bin:/usr/bin',
unless => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
before => Anchor["apt::key ${upkey} present"],
exec { $digest:
path => '/bin:/usr/bin',
unless => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
before => Anchor["apt::key ${upkey} present"],
- command => $method ? {
- 'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
- 'source' => "wget -q '${key_source}' -O- | apt-key add -",
- 'server' => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
- },
+ command => $digest_command,
}
}
}
}
@@
-57,11
+58,11
@@
define apt::key (
}
absent: {
}
absent: {
- if defined(Anchor["apt::key $
upkey
present"]) {
- fail
("Cannot ensure Apt::Key[$upkey] absent; $upkey
already ensured present")
+ if defined(Anchor["apt::key $
{upkey}
present"]) {
+ fail
("Cannot ensure Apt::Key[${upkey}] absent; ${upkey}
already ensured present")
}
}
- exec { "apt::key $
upkey
absent":
+ exec { "apt::key $
{upkey}
absent":
path => '/bin:/usr/bin',
onlyif => "apt-key list | grep '${upkey}'",
command => "apt-key del '${upkey}'",
path => '/bin:/usr/bin',
onlyif => "apt-key list | grep '${upkey}'",
command => "apt-key del '${upkey}'",