projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quote stuff?
[mirror/dsa-puppet.git]
/
modules
/
apt-keys
/
manifests
/
init.pp
diff --git
a/modules/apt-keys/manifests/init.pp
b/modules/apt-keys/manifests/init.pp
index
6ecdca6
..
92966b9
100644
(file)
--- a/
modules/apt-keys/manifests/init.pp
+++ b/
modules/apt-keys/manifests/init.pp
@@
-3,17
+3,22
@@
class apt-keys {
"/etc/apt/trusted-keys.d/":
ensure => directory,
purge => true,
"/etc/apt/trusted-keys.d/":
ensure => directory,
purge => true,
- notify => Exec["
updatekeys
"],
+ notify => Exec["
apt-keys-update
"],
;
;
+ "/etc/apt/trusted-keys.d/backports.org.asc":
+ source => "puppet:///apt-keys/backports.org.asc",
+ mode => 664,
+ notify => Exec["apt-keys-update"],
+ ;
"/etc/apt/trusted-keys.d/db.debian.org.asc":
source => "puppet:///apt-keys/db.debian.org.asc",
mode => 664,
"/etc/apt/trusted-keys.d/db.debian.org.asc":
source => "puppet:///apt-keys/db.debian.org.asc",
mode => 664,
- notify => Exec["
updatekeys
"],
+ notify => Exec["
apt-keys-update
"],
;
}
;
}
- exec { "
updatekeys
":
+ exec { "
apt-keys-update
":
command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done',
refreshonly => true
}
command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done',
refreshonly => true
}