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

diff --git a/manifests/init.pp b/manifests/init.pp
index c79c31d7b54ebec746d822aebea00c2c9ed1847c..dc868d7b90a1e059428743e57b3b18b0b7ab4818 100644 (file)
--- 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];