Trying a different way to test definitions at backupninja::client::key

diff --git a/manifests/client.pp b/manifests/client.pp
index f8c5e2374d055972500dcb623d26588579ec3fa5..869e75b5af1acba309a8436c156f4595cfc59680 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -75,15 +75,18 @@ class backupninja::client inherits backupninja::client::defaults {
        default => $keytype,
     }
 
+    $key_dest      = "${backupninja::client::defaults::real_keydestination}"
+    $key_dest_file = "$key_dest/id_$key_type"
+
     case $install_key {
       true: {
-        if !defined(File["${backupninja::client::defaults::real_keydestination}"]) {
+        if !defined(File["$key_dest"]) {
           file { "${backupninja::client::defaults::real_keydestination}":
             ensure => directory,
             mode => 0700, owner => $key_owner, group => $key_group,
           }
         }
-        if !defined(File["${backupninja::client::defaults::real_keydestination/id_${key_type}"]) {
+        if !defined(File["$key_dest_file"]) {
           file { "${backupninja::client::defaults::real_keydestination}/id_${key_type}":
             source => "${key_store}/${real_user}_id_${key_type}",
             mode => 0400, owner => $key_owner, group => $key_group,