projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decommission goedel (rt#3690)
[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
92966b9
..
bb3574e
100644
(file)
--- a/
modules/apt-keys/manifests/init.pp
+++ b/
modules/apt-keys/manifests/init.pp
@@
-1,26
+1,29
@@
class apt-keys {
file {
"/etc/apt/trusted-keys.d/":
class apt-keys {
file {
"/etc/apt/trusted-keys.d/":
- ensure => directory,
- purge => true,
- notify => Exec["apt-keys-update"],
- ;
+
ensure => directory,
+
purge => true,
+
notify => Exec["apt-keys-update"],
+
;
"/etc/apt/trusted-keys.d/backports.org.asc":
"/etc/apt/trusted-keys.d/backports.org.asc":
-
source => "puppet://
/apt-keys/backports.org.asc",
- mode => 664,
- notify => Exec["apt-keys-update"],
- ;
+
source => "puppet:///modules
/apt-keys/backports.org.asc",
+
mode => 664,
+
notify => Exec["apt-keys-update"],
+
;
"/etc/apt/trusted-keys.d/db.debian.org.asc":
"/etc/apt/trusted-keys.d/db.debian.org.asc":
-
source => "puppet://
/apt-keys/db.debian.org.asc",
- mode => 664,
- notify => Exec["apt-keys-update"],
- ;
+
source => "puppet:///modules
/apt-keys/db.debian.org.asc",
+
mode => 664,
+
notify => Exec["apt-keys-update"],
+
;
}
exec { "apt-keys-update":
}
exec { "apt-keys-update":
- command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done',
+ command => '
/bin/true &&
for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done',
refreshonly => true
}
}
refreshonly => true
}
}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: