summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2015-06-11 10:21:56 -0400
committerAntoine Beaupré <anarcat@koumbit.org>2015-06-11 10:26:10 -0400
commit891aa0fbbed87e24322da7d3a80514f1bf94f0ac (patch)
tree943df3555a47e2da1e9e388a7c1abba5a042ecb6 /manifests
parent33acc00e5c6d8ab18f2992cccc8ee036b4d7771d (diff)
allow for binary keys that can be removed
Diffstat (limited to 'manifests')
-rw-r--r--manifests/key.pp15
-rw-r--r--manifests/key/plain.pp13
2 files changed, 18 insertions, 10 deletions
diff --git a/manifests/key.pp b/manifests/key.pp
index 0ef9721..3f9660f 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,13 +1,8 @@
-define apt::key ($source) {
+define apt::key ($ensure => 'present', $source) {
file {
- "${apt::apt_base_dir}/${name}":
- source => $source;
- "${apt::apt_base_dir}/keys":
- ensure => directory;
- }
- exec { "apt-key add ${apt::apt_base_dir}/${name}":
- subscribe => File["${apt::apt_base_dir}/${name}"],
- refreshonly => true,
- notify => Exec['refresh_apt'],
+ "/etc/apt/trusted.gpg.d/$name":
+ source => $source,
+ ensure => $ensure,
+ notify => Exec['refresh_apt'],
}
}
diff --git a/manifests/key/plain.pp b/manifests/key/plain.pp
new file mode 100644
index 0000000..a84e6dd
--- /dev/null
+++ b/manifests/key/plain.pp
@@ -0,0 +1,13 @@
+define apt::key::plain ($source) {
+ file {
+ "${apt::apt_base_dir}/${name}":
+ source => $source;
+ "${apt::apt_base_dir}/keys":
+ ensure => directory;
+ }
+ exec { "apt-key add ${apt::apt_base_dir}/${name}":
+ subscribe => File["${apt::apt_base_dir}/${name}"],
+ refreshonly => true,
+ notify => Exec['refresh_apt'],
+ }
+}