Skip to content

Commit

Permalink
Fix accidental typo in hiera keys, fixes #83
Browse files Browse the repository at this point in the history
  • Loading branch information
fpletz committed May 8, 2015
1 parent 4817660 commit 9da34f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion manifests/fpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
validate_hash($settings)
validate_hash($pools)

$real_settings = deep_merge($settings, hiera_hash('::php::fpm::settings', {}))
$real_settings = deep_merge($settings, hiera_hash('php::fpm::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.
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
# FIXME: for deep merging support we need a explicit hash lookup instead of
# automatic parameter lookup
# (https://tickets.puppetlabs.com/browse/HI-118)
$real_settings = hiera_hash('::php::settings', $settings)
$real_settings = hiera_hash('php::settings', $settings)

$real_extensions = hiera_hash('php::extensions', $extensions)
create_resources('::php::extension', $real_extensions, {
Expand Down

0 comments on commit 9da34f3

Please sign in to comment.