Merge pull request #2 from cdenneen/patch-1

Re-hash proftpd::options
markt-de · Apr 17, 2015 · a37dd1b · a37dd1b
2 parents fc9d46e + a904170
commit a37dd1b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -15,11 +15,13 @@
     else { $real_defaults = $::proftpd::default_options }
 
     # check if defaults should be included
+    # re-hash due to hiera 1.x known limitation
+    $hash_options = hiera_hash('proftpd::options',$::proftpd::options)
     if ( $::proftpd::default_config == true ) {
-      $real_options = deep_merge($real_defaults, $::proftpd::options)
+      $real_options = deep_merge($real_defaults, $hash_options)
     }
     # do not include defaults
-    else { $real_options = $::proftpd::options }
+    else { $real_options = $hash_options }
 
     # required variables
     $base_dir     = $::proftpd::base_dir