aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-04-08 12:14:38 -0400
committerMicah Anderson <micah@riseup.net>2009-04-08 12:14:38 -0400
commitbe656a6ac84de6a0df70b43cf8ac250f5720d4cc (patch)
tree9cc6ecce550c63d6dcd8289a307d2dbb2610cd61
parent49eb18e510bb8dfedc762fd00bd3dff06e72d6de (diff)
downloadpuppet-apt-be656a6ac84de6a0df70b43cf8ac250f5720d4cc.tar.gz
puppet-apt-be656a6ac84de6a0df70b43cf8ac250f5720d4cc.tar.bz2
Revert "fix the custom_key_dir process so it actually works by replacing the"
This reverts commit 21ef026475782d5b59597a27fa06cfab7c9224dc. apt-key does not support glob options
-rw-r--r--manifests/init.pp5
1 files changed, 2 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c79c31d..dc868d7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -138,12 +138,11 @@ class apt {
}
default: {
file { "${apt_base_dir}/keys.d":
- source => "${custom_key_dir}",
+ source => "$custom_key_dir",
recurse => true,
mode => 0755, owner => root, group => root,
- notify => Exec[custom_keys];
}
- exec { "/usr/bin/apt-key add ${apt_base_dir}/keys.d/* && apt-get update":
+ exec { "for key in `ls ${apt_base_dir/keys.d/` ; do /usr/bin/apt-key add ${apt_base_dir}/$key && apt-get update":
alias => "custom_keys",
refreshonly => true,
before => File[apt_config];