From fce98590aa4165bdece686af4df33d5da04047c2 Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Fri, 15 May 2015 18:38:40 +1000 Subject: [PATCH 1/7] Bump PHP secure versions, --- data/common.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/common.yaml b/data/common.yaml index 7b5984b..2f71d7a 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -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 From a092b884ab3bec63a2b5585a85d91bd6044abb0b Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Fri, 15 May 2015 18:40:22 +1000 Subject: [PATCH 2/7] Bump PHP secure versions in tests, --- spec/fixtures/hiera/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml index 4084a6e..4cff9a1 100644 --- a/spec/fixtures/hiera/test.yaml +++ b/spec/fixtures/hiera/test.yaml @@ -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 From 36d3212f0693d7c31cacdd97c97efc38628500b1 Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Fri, 15 May 2015 18:38:40 +1000 Subject: [PATCH 3/7] Bump PHP secure versions, --- data/common.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/common.yaml b/data/common.yaml index 32c053c..16cc19a 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -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 From 6c6b307114d54b7f8b444e86bca6c701df11cfd6 Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Fri, 15 May 2015 18:40:22 +1000 Subject: [PATCH 4/7] Bump PHP secure versions in tests, --- spec/fixtures/hiera/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/fixtures/hiera/test.yaml b/spec/fixtures/hiera/test.yaml index 4084a6e..4cff9a1 100644 --- a/spec/fixtures/hiera/test.yaml +++ b/spec/fixtures/hiera/test.yaml @@ -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 From 5d32a851b6ba98885df387fe3c817fdd6312ca0c Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Thu, 4 Jun 2015 17:16:13 +1000 Subject: [PATCH 5/7] Properly ensure PHP is present with php_require --- lib/puppet/parser/functions/php_fpm_require.rb | 2 +- lib/puppet/parser/functions/php_require.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/parser/functions/php_fpm_require.rb b/lib/puppet/parser/functions/php_fpm_require.rb index 8b1d496..9fd83bf 100644 --- a/lib/puppet/parser/functions/php_fpm_require.rb +++ b/lib/puppet/parser/functions/php_fpm_require.rb @@ -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 diff --git a/lib/puppet/parser/functions/php_require.rb b/lib/puppet/parser/functions/php_require.rb index 538d476..3266d48 100644 --- a/lib/puppet/parser/functions/php_require.rb +++ b/lib/puppet/parser/functions/php_require.rb @@ -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 From ef429dbaa96d7a5dc01df20e02bf57407940cd4e Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Thu, 4 Jun 2015 17:30:13 +1000 Subject: [PATCH 6/7] Update Changelog to add 2.0.1 release note --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df4f2b..bbf62b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.1 ## + +* Fix bug in php\_require and php\_fpm\_require functions + ## 2.0.0 ## * Use Hiera for configs From 7a423c9bf4bb0c3f9cf4b97b934325316e4fe734 Mon Sep 17 00:00:00 2001 From: Sam Bauers Date: Thu, 4 Jun 2015 17:32:24 +1000 Subject: [PATCH 7/7] More info for changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf62b5..3c3d962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 2.0.1 ## -* Fix bug in php\_require and php\_fpm\_require functions +* 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 ##