From 0dc8465a591ba14bd95b0756d29984115d548b52 Mon Sep 17 00:00:00 2001
From: cdenneen <cdenneen@gmail.com>
Date: Fri, 17 Apr 2015 12:48:21 -0400
Subject: [PATCH] re-hash due to hiera known limitation

Due to known limitation the hash has to be re-done here for deep merging to work:
https://docs.puppetlabs.com/hiera/1/puppet.html#limitations
---
 manifests/config.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index fe90114..30856e6 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,12 +15,14 @@
     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
     $load_modules = $::proftpd::load_modules