From 99f33b66f66f0f9f3cb9ee56f2d639bbad941755 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Feb 2017 22:05:06 +0100 Subject: [PATCH 1/8] rerelease 4.0.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index bd85f2cc..6c8cf66d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-php", - "version": "4.0.1-rc0", + "version": "4.0.0", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT", From 912a644c59d4513707cc943d8aa7781eeb4fa55d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Feb 2017 22:03:15 +0100 Subject: [PATCH 2/8] add secrets to .{travis,secrets}.yml --- .sync.yml | 3 +++ .travis.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .sync.yml diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 00000000..dbe8e9f2 --- /dev/null +++ b/.sync.yml @@ -0,0 +1,3 @@ +--- +.travis.yml: + secure: "GOhttACuJt+3s38m4WnW5RuTgwqaAoeEQnNT+X1Ukn7KdcIk4KV8NzYU/CC0VIm8lUOnBWYJKEC4ixX/J/4Wbxox2RAoKMQrO++L0DB1zTCJnq9SfoUBMaQhXvLu+PbxAR0p3P47ozra0C+pOWDpOaxT9ecufrPQt9W9Z4aY/bs=" diff --git a/.travis.yml b/.travis.yml index 7ab6632a..1c72ebec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ deploy: provider: puppetforge user: puppet password: - secure: "" + secure: "GOhttACuJt+3s38m4WnW5RuTgwqaAoeEQnNT+X1Ukn7KdcIk4KV8NzYU/CC0VIm8lUOnBWYJKEC4ixX/J/4Wbxox2RAoKMQrO++L0DB1zTCJnq9SfoUBMaQhXvLu+PbxAR0p3P47ozra0C+pOWDpOaxT9ecufrPQt9W9Z4aY/bs=" on: tags: true # all_branches is required to use tags From 176c15823c170a4ee06431897a95600a8ce255b6 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Feb 2017 22:05:18 +0100 Subject: [PATCH 3/8] [blacksmith] Bump version to 4.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6c8cf66d..bd85f2cc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-php", - "version": "4.0.0", + "version": "4.0.1-rc0", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT", From ae4d489d12539b61f7501e2cdc67eefa0cf7cb37 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Feb 2017 22:06:11 +0100 Subject: [PATCH 4/8] rerelease 4.0.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index bd85f2cc..6c8cf66d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-php", - "version": "4.0.1-rc0", + "version": "4.0.0", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT", From 255ea90583e1c007d3840ec37a3440029b380915 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 11 Feb 2017 22:06:14 +0100 Subject: [PATCH 5/8] [blacksmith] Bump version to 4.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 6c8cf66d..bd85f2cc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-php", - "version": "4.0.0", + "version": "4.0.1-rc0", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT", From b5e3b91cc63b932446dc378c7e014317cf2bcf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Barboiron?= Date: Thu, 16 Mar 2017 12:10:01 +0100 Subject: [PATCH 6/8] don't try to load extension.so for pear modules inspired by 8cb3fb573a3c6227f40daf3c04e04ec7d7d6fc42 --- manifests/extension.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/extension.pp b/manifests/extension.pp index b3e6624d..dda8456e 100644 --- a/manifests/extension.pp +++ b/manifests/extension.pp @@ -175,10 +175,14 @@ $full_settings = $settings } - $final_settings = deep_merge( - {"${extension_key}" => "${module_path}${so_name}.so"}, - $full_settings - ) + if $provider != 'pear' { + $final_settings = deep_merge( + {"${extension_key}" => "${module_path}${so_name}.so"}, + $full_settings + ) + } else { + $final_settings = $full_settings + } $config_root_ini = pick_default($::php::config_root_ini, $::php::params::config_root_ini) ::php::config { $title: From 65f5469df1ac2df940d186ee1135fbc8be206ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Barboiron?= Date: Thu, 29 Jun 2017 17:09:38 +0200 Subject: [PATCH 7/8] pear/pecl: pass install_options to provider --- manifests/extension.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/extension.pp b/manifests/extension.pp index dda8456e..1217903b 100644 --- a/manifests/extension.pp +++ b/manifests/extension.pp @@ -71,6 +71,7 @@ $settings_prefix = false, $sapi = 'ALL', $responsefile = undef, + $install_options = undef, ) { if ! defined(Class['php']) { @@ -110,11 +111,12 @@ if $provider == 'pecl' or $provider == 'pear' { ensure_packages( [ $real_package ], { - ensure => $ensure, - provider => $provider, - source => $real_source, - responsefile => $responsefile, - require => [ + ensure => $ensure, + provider => $provider, + source => $real_source, + responsefile => $responsefile, + install_options => $install_options, + require => [ Class['::php::pear'], Class['::php::dev'], ], From 7030901d1ac1ec73d9883630cc6e7cdaba6f105c Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Wed, 2 Aug 2017 10:52:22 -0700 Subject: [PATCH 8/8] Release 5.0.0 --- CHANGELOG.md | 33 ++++++++++++++++++++++++++++++++- metadata.json | 2 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d00266e8..4133d563 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,35 @@ # Changelog -## 2017-02-11 Release 4.0.0 +## 2017-08-02 Release [5.0.0] +### Summary +This backwards-incompatible release drops puppet 3, PHP 5.5 on Ubuntu, and the deprecated `php::extension` parameter `pecl_source`. It improves much of the internal code quality, and adds several useful features the most interesting of which is probably the `php::extension` parameter `ini_prefix`. + +### Changed +- Drop puppet 3 compatibility. +- Bumped puppetlabs-apt lower bound to 4.1.0 +- Bumped puppetlabs-stdlib lower bound to 4.13.1 + +### Removed +- Deprecated `php::extension` define parameters `pecl_source`. Use `source` instead. +- PHP 5.5 support on ubuntu. + +### Added +- `php` class parameters `fpm_user` and `fpm_group` to customize php-fpm user/group. +- `php::fpm` class parameters `user` and `group`. +- `php::fpm::pool` define parameter `pm_process_idle_timeout` and pool.conf `pm.process_idle_timeout` directive. +- `php::extension` class parameters `ini_prefix` and `install_options`. +- Archlinux compatibility. +- Bumped puppetlabs-apt upper bound to 5.0.0 + +### Fixed +- Replaced validate functions with data types. +- Linting issues. +- Replace legacy facts with facts hash. +- Simplify `php::extension` +- Only apt dependency when `manage_repos => true` +- No more example42/yum dependency + +## 2017-02-11 Release [4.0.0] This is the last release with Puppet3 support! * Fix a bug turning `manage_repos` off on wheezy @@ -191,3 +220,5 @@ This is the last release with Puppet3 support! ## 1.0.0 Initial release +[4.1.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v4.0.0...v4.1.0 +[4.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v3.4.2...v4.0.0 diff --git a/metadata.json b/metadata.json index e5578b60..e865f6ef 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-php", - "version": "5.0.0-rc0", + "version": "5.0.0", "author": "Vox Pupuli", "summary": "Generic PHP module that supports many platforms", "license": "MIT",