Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Fix php_require function, bump PHP secure versions. #69

Merged
merged 9 commits into from
Jun 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.1 ##

* Composer updated to 1.0.0-alpha10 (@alexmace)
* Add pspell extension (@alexmace)
* Fix bug in `php_require` and `php_fpm_require` functions (@sambauers)

## 2.0.0 ##

* Use Hiera for configs
Expand Down
6 changes: 3 additions & 3 deletions data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ php::config::composer:
php::config::phpenv:
revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
php::config::secure_versions:
'5.6': '5.6.8'
'5.5': '5.5.24'
'5.4': '5.4.40'
'5.6': '5.6.9'
'5.5': '5.5.25'
'5.4': '5.4.41'
php::config::secure_warning: true
2 changes: 1 addition & 1 deletion lib/puppet/parser/functions/php_fpm_require.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Puppet::Parser::Functions
newfunction(:php_fpm_require) do |args|
Puppet::Parser::Functions.function('ensure_resource')
function_ensure_resource( [ 'php::fpm', args[0] ] )
function_ensure_resource( [ 'php::fpm', args[0], {'ensure' => 'present'} ] )
end
end
2 changes: 1 addition & 1 deletion lib/puppet/parser/functions/php_require.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Puppet::Parser::Functions
newfunction(:php_require) do |args|
Puppet::Parser::Functions.function('ensure_resource')
function_ensure_resource( [ 'php::version', args[0] ] )
function_ensure_resource( [ 'php::version', args[0], {'ensure' => 'present'} ] )
end
end
6 changes: 3 additions & 3 deletions spec/fixtures/hiera/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ php::config::composer:
php::config::phpenv:
revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'
php::config::secure_versions:
'5.6': '5.6.7'
'5.5': '5.5.23'
'5.4': '5.4.39'
'5.6': '5.6.9'
'5.5': '5.5.25'
'5.4': '5.4.41'
php::config::secure_warning: true