Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy top-scope syntax #706

Merged
merged 1 commit into from
Dec 5, 2023
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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:**

Expand All @@ -210,7 +210,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))
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
}
```
Expand All @@ -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',
Expand All @@ -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 => {
Expand Down Expand Up @@ -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',
}
Expand Down Expand Up @@ -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
}
```
Expand All @@ -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' => {
Expand Down
2 changes: 1 addition & 1 deletion manifests/cli.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/extension/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/fpm/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
}

if $inifile != $php::params::config_root_inifile {
::php::config { 'fpm':
php::config { 'fpm':
file => $inifile,
config => $settings,
}
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/php_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,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}'
}"
Expand All @@ -404,7 +404,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}'
}"
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/extension_rhscl_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading