Merge pull request #550 from sigv/536

Do a `deep` merge on `fpm` lookup

Author: bastelfreak

README.md

@@ -240,6 +240,24 @@ php::fpm::pools:
 
 ## Notes
 
+### Inheriting configuration across mutliple Hiera sources
+
+Configuration from Hiera such as `php::fpm::pools` is automatically
+lookup up using the "first" merge method. This means that the first
+value found is used. If you instead want to merge the hash keys
+across multiple Hiera sources, you can use [`lookup_options`] to
+set [`hash` or `deep` behaviors] such as in the example
+[data/default.yaml](data/default.yaml):
+
+```yaml
+lookup_options:
+  php::fpm::pools:
+    merge: hash
+```
+
+[`lookup_options`]: https://puppet.com/docs/puppet/6.4/hiera_merging.html#concept-2997
+[`hash` or `deep` behaviors]: https://puppet.com/docs/puppet/6.4/hiera_merging.html#merge-behaviors
+
 ### Debian squeeze & Ubuntu precise come with PHP 5.3
 
 On Debian-based systems, we use `php5enmod` to enable extension-specific

data/default.yaml

@@ -1,5 +1,10 @@
 ---
-php::fpm_pools:
+
+lookup_options:
+  php::fpm::pools:
+    merge: first
+
+php::fpm::pools:
   www:
     catch_workers_output: 'no'
     listen: '127.0.0.1:9000'

manifests/fpm.pp

@@ -70,7 +70,7 @@
     warning('php::fpm is private')
   }
 
-  $real_settings = lookup('php::fpm::settings', Hash, {'strategy' => 'deep', 'merge_hash_arrays' => true}, $settings)
+  $real_settings = $settings
 
   # On FreeBSD fpm is not a separate package, but included in the 'php' package.
   # Implies that the option SET+=FPM was set when building the port.
@@ -99,8 +99,8 @@
 
   Class['php::fpm::config'] ~> Class['php::fpm::service']
 
-  $real_global_pool_settings = lookup('php::fpm::global_pool_settings', Hash, {'strategy' => 'unique'}, $global_pool_settings)
-  $real_pools = lookup('php::fpm::pools', Hash, {'strategy' => 'unique'}, $pools)
+  $real_global_pool_settings = $global_pool_settings
+  $real_pools = $pools
   create_resources(::php::fpm::pool, $real_pools, $real_global_pool_settings)
 
   # Create an override to use a reload signal as trusty and utopic's