diff options
author | Micah Anderson <micah@riseup.net> | 2009-03-16 14:35:33 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2009-03-16 14:35:33 -0400 |
commit | 21ef026475782d5b59597a27fa06cfab7c9224dc (patch) | |
tree | c2cb09b281aa3461e1e4bdf45d9264b4b21ce51c | |
parent | 45165052e8c5a50377857213c525bcc917fa06c1 (diff) | |
download | puppet-apt-21ef026475782d5b59597a27fa06cfab7c9224dc.tar.gz puppet-apt-21ef026475782d5b59597a27fa06cfab7c9224dc.tar.bz2 |
fix the custom_key_dir process so it actually works by replacing the
bulky for loop in the exec with a much more simpler process that
works. Also, the recurse over the key dir needed to notify the exec to
trigger it.
-rw-r--r-- | manifests/init.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index dc868d7..c79c31d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -138,11 +138,12 @@ 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 { "for key in `ls ${apt_base_dir/keys.d/` ; do /usr/bin/apt-key add ${apt_base_dir}/$key && apt-get update": + exec { "/usr/bin/apt-key add ${apt_base_dir}/keys.d/* && apt-get update": alias => "custom_keys", refreshonly => true, before => File[apt_config]; |