improve decision handling, remove unnecessary exec

diff --git a/manifests/init.pp b/manifests/init.pp
index af860f7d6d17d89a7f6cc19ead89972b973cb053..78ae6c5d4a8cc4b5ce39f8c64511477e87a7e8fd 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -110,27 +110,20 @@ class apt {
     }
   }
 
-  case $custom_key_dir {
-    '': {
-      exec { "/bin/true # no_custom_keydir": }
+  if $custom_key_dir {
+    file { "${apt_base_dir}/keys.d":
+      source => "$custom_key_dir",
+      recurse => true,
+      mode => 0755, owner => root, group => root,
     }
-    default: {
-      file { "${apt_base_dir}/keys.d":
-        source => "$custom_key_dir",
-        recurse => true,
-        mode => 0755, owner => root, group => root,
-      }
-      exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update":
-        alias => "custom_keys",
-        subscribe => File["${apt_base_dir}/keys.d"],
-        refreshonly => true,
-        before => Config_file[apt_config];
-      }
+    exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update":
+      alias => "custom_keys",
+      subscribe => File["${apt_base_dir}/keys.d"],
+      refreshonly => true,
+      before => Config_file[apt_config];
     }
   }
 
   # workaround for preseeded_package component
-  file { "/var/cache": ensure => directory }
-  file { "/var/cache/local": ensure => directory }
-  file { "/var/cache/local/preseeding": ensure => directory }
+  file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory }
 }