diff --git a/CHANGELOG.md b/CHANGELOG.md index 92576ada..9e48d32f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -200,7 +200,7 @@ These should not affect the functionality of the module. - Fpm config results in "expects a Hash value, got Tuple" [\#536](https://github.com/voxpupuli/puppet-php/issues/536) - composer created as folder not binary file [\#535](https://github.com/voxpupuli/puppet-php/issues/535) - Forge Release [\#528](https://github.com/voxpupuli/puppet-php/issues/528) -- Invalid tag '::php::config' on node ... [\#177](https://github.com/voxpupuli/puppet-php/issues/177) +- Invalid tag 'php::config' on node ... [\#177](https://github.com/voxpupuli/puppet-php/issues/177) **Merged pull requests:** @@ -222,7 +222,7 @@ These should not affect the functionality of the module. - Remove hard dependency from apt-transport-https [\#454](https://github.com/voxpupuli/puppet-php/issues/454) - use php::global::php\_version for php::repo::\* version [\#222](https://github.com/voxpupuli/puppet-php/issues/222) -- refactor ::php::repo::debian to use the version variable [\#219](https://github.com/voxpupuli/puppet-php/issues/219) +- refactor php::repo::debian to use the version variable [\#219](https://github.com/voxpupuli/puppet-php/issues/219) - push back hard dependency on hiera [\#215](https://github.com/voxpupuli/puppet-php/issues/215) - Support PHP 7.0 on FreeBSD [\#207](https://github.com/voxpupuli/puppet-php/issues/207) - set default version for debian buster and add support for buster [\#530](https://github.com/voxpupuli/puppet-php/pull/530) ([lelutin](https://github.com/lelutin)) diff --git a/README.md b/README.md index 1d60cd18..e05e683b 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ This originally was a fork of [jippi/puppet-php](https://github.com/jippi/puppet Quickest way to get started is simply `include`'ing the _`php` class_. ```puppet -include '::php' +include 'php' ``` Or, you can override defaults and specify additional custom -configurations by declaring `class { '::php': }` with parameters: +configurations by declaring `class { 'php': }` with parameters: ```puppet -class { '::php': +class { 'php': ensure => latest, manage_repos => true, fpm => true, @@ -37,11 +37,11 @@ class { '::php': Optionally the PHP version or configuration root directory can be changed also: ```puppet -class { '::php::globals': +class { 'php::globals': php_version => '7.0', config_root => '/etc/php/7.0', }-> -class { '::php': +class { 'php': manage_repos => true } ``` @@ -63,7 +63,7 @@ In the following example the PHP options and timezone will be set in all PHP configurations, i.e. the PHP cli application and all php-fpm pools. ```puppet - class { '::php': + class { 'php': settings => { 'PHP/max_execution_time' => '90', 'PHP/max_input_time' => '300', @@ -82,7 +82,7 @@ as parameter `extensions` on the main `php` class. They are activated for all activated SAPIs. ```puppet - class { '::php': + class { 'php': extensions => { bcmath => { }, imagick => { @@ -128,7 +128,7 @@ see [its documentation](REFERENCE.md#php--fpm--pool). By default, php-fpm is set up to run as Apache. If you need to customize that user, you can do that like so: ```puppet - class { '::php': + class { 'php': fpm_user => 'nginx', fpm_group => 'nginx', } @@ -343,11 +343,11 @@ This ensures that the module will create configurations in the directory manage the SCL repo's by your own. ```puppet -class { '::php::globals': +class { 'php::globals': php_version => 'rh-php71', rhscl_mode => 'rhscl', } --> class { '::php': +-> class { 'php': manage_repos => false } ``` @@ -359,7 +359,7 @@ this module, since this module specifies an extension by name and derives the na from it. To manage extensions of SCL packages you must use the following parameters: ```puppet -class { '::php': +class { 'php': ... extensions => { 'soap' => { diff --git a/manifests/cli.pp b/manifests/cli.pp index 7eb0bb14..2b35a4ee 100644 --- a/manifests/cli.pp +++ b/manifests/cli.pp @@ -36,7 +36,7 @@ if $inifile != $php::params::config_root_inifile { # only create a cli specific inifile if the filenames are different - ::php::config { 'cli': + php::config { 'cli': file => $inifile, config => $real_settings, } diff --git a/manifests/extension/config.pp b/manifests/extension/config.pp index 1fd0ba68..7fa3ce4a 100644 --- a/manifests/extension/config.pp +++ b/manifests/extension/config.pp @@ -95,7 +95,7 @@ $config_root_ini = pick_default($php::config_root_ini, $php::params::config_root_ini) if $real_ensure != 'absent' { - ::php::config { $title: + php::config { $title: file => "${config_root_ini}/${ini_prefix}${ini_name}.ini", config => $final_settings, } diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp index 3cc1a635..71abf6ce 100644 --- a/manifests/fpm/config.pp +++ b/manifests/fpm/config.pp @@ -141,7 +141,7 @@ } if $inifile != $php::params::config_root_inifile { - ::php::config { 'fpm': + php::config { 'fpm': file => $inifile, config => $settings, } diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb index 9b4585ba..ce687b10 100644 --- a/spec/classes/php_spec.rb +++ b/spec/classes/php_spec.rb @@ -393,7 +393,7 @@ scl_php_version = 'php56' rhscl_mode = 'remi' let(:pre_condition) do - "class {'::php::globals': + "class {'php::globals': php_version => '#{scl_php_version}', rhscl_mode => '#{rhscl_mode}' }" @@ -416,7 +416,7 @@ scl_php_version = 'rh-php56' rhscl_mode = 'rhscl' let(:pre_condition) do - "class {'::php::globals': + "class {'php::globals': php_version => '#{scl_php_version}', rhscl_mode => '#{rhscl_mode}' }" diff --git a/spec/defines/extension_rhscl_spec.rb b/spec/defines/extension_rhscl_spec.rb index 383f4582..197ef173 100644 --- a/spec/defines/extension_rhscl_spec.rb +++ b/spec/defines/extension_rhscl_spec.rb @@ -17,11 +17,11 @@ configs_root = "/etc/opt/#{rhscl_mode}/#{scl_php_version}" let(:pre_condition) do - "class {'::php::globals': + "class {'php::globals': php_version => '#{scl_php_version}', rhscl_mode => '#{rhscl_mode}' }-> - class {'::php': + class {'php': ensure => installed, manage_repos => false, fpm => false,