Skip to content

Commit

Permalink
Deep merge php::extensions
Browse files Browse the repository at this point in the history
Handles `php::extensions` the same way as `php::settings`.

Requires major release.

fixes jippi#108
  • Loading branch information
globin committed Sep 27, 2015
1 parent 710cd86 commit fa5af07
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# Changelog

## 3.5.0
* Fix a bug turning `manage_repos` of on wheezy
* Fix a deprecation warning on apt::key when using manage_repos on wheezy (#110)
## 4.0.0
* Fix a bug turning `manage_repos` off on wheezy
* Fix a deprecation warning on `apt::key` when using `manage_repos` on wheezy (#110)
This change requires puppetlabs/apt at >= 1.8.0

### Breaking Changes
* Deep merge `php::extensions` the same way as `php::settings`. This technically is a
breaking change but should not affect many people.

## 3.4.2
* Fix a bug that changed the default of `php::manage_repos` to `false` on
Debian-based operating systems except wheezy. It should be turned on by
Expand Down
4 changes: 3 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
# Deep merge global php settings
$real_settings = deep_merge($settings, hiera_hash('php::settings', {}))

# Deep merge global php extensions
$real_extensions = deep_merge($extensions, hiera_hash('php::extensions', {}))

if $manage_repos {
class { '::php::repo': } ->
Anchor['php::begin']
Expand Down Expand Up @@ -103,7 +106,6 @@
Anchor['php::end']
}

$real_extensions = hiera_hash('php::extensions', $extensions)
create_resources('::php::extension', $real_extensions, {
require => Class['::php::cli'],
before => Anchor['php::end']
Expand Down

0 comments on commit fa5af07

Please sign in to comment.