Showing with 63 additions and 12,918 deletions.
  1. +7 −4 .github/CONTRIBUTING.md
  2. +1 −1 .msync.yml
  3. +2 −0 .rubocop.yml
  4. +7 −0 .rubocop_todo.yml
  5. +17 −0 CHANGELOG.md
  6. +1 −1 Gemfile
  7. +19 −34 README.md
  8. +0 −105 docs/Puppet/Parser/Functions.html
  9. +0 −369 docs/_index.html
  10. +0 −8 docs/css/common.css
  11. +0 −58 docs/css/full_list.css
  12. +0 −492 docs/css/style.css
  13. +0 −340 docs/file.README.html
  14. +0 −17 docs/frames.html
  15. +0 −340 docs/index.html
  16. +0 −248 docs/js/app.js
  17. +0 −216 docs/js/full_list.js
  18. +0 −4 docs/js/jquery.js
  19. +0 −209 docs/puppet_class_list.html
  20. +0 −906 docs/puppet_classes/php.html
  21. +0 −182 docs/puppet_classes/php_3A_3Aapache_config.html
  22. +0 −182 docs/puppet_classes/php_3A_3Acli.html
  23. +0 −302 docs/puppet_classes/php_3A_3Acomposer.html
  24. +0 −246 docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html
  25. +0 −216 docs/puppet_classes/php_3A_3Adev.html
  26. +0 −244 docs/puppet_classes/php_3A_3Aembedded.html
  27. +0 −482 docs/puppet_classes/php_3A_3Afpm.html
  28. +0 −596 docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html
  29. +0 −245 docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html
  30. +0 −175 docs/puppet_classes/php_3A_3Aglobal.html
  31. +0 −384 docs/puppet_classes/php_3A_3Aglobals.html
  32. +0 −232 docs/puppet_classes/php_3A_3Apackages.html
  33. +0 −490 docs/puppet_classes/php_3A_3Aparams.html
  34. +0 −258 docs/puppet_classes/php_3A_3Apear.html
  35. +0 −248 docs/puppet_classes/php_3A_3Aphpunit.html
  36. +0 −189 docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html
  37. +0 −169 docs/puppet_classes/php_3A_3Arepo.html
  38. +0 −312 docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html
  39. +0 −177 docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html
  40. +0 −175 docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html
  41. +0 −177 docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html
  42. +0 −104 docs/puppet_defined_type_list.html
  43. +0 −223 docs/puppet_defined_types/php_3A_3Aapache_vhost.html
  44. +0 −174 docs/puppet_defined_types/php_3A_3Aconfig.html
  45. +0 −226 docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html
  46. +0 −460 docs/puppet_defined_types/php_3A_3Aextension.html
  47. +0 −418 docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html
  48. +0 −356 docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html
  49. +0 −935 docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html
  50. +0 −71 docs/puppet_function_list.html
  51. +0 −259 docs/puppet_functions_ruby3x/ensure_prefix.html
  52. +0 −224 docs/puppet_functions_ruby3x/to_hash_settings.html
  53. +0 −71 docs/puppet_provider_list.html
  54. +0 −129 docs/puppet_providers_package/pear.html
  55. +0 −129 docs/puppet_providers_package/pecl.html
  56. +0 −98 docs/top-level-namespace.html
  57. +2 −2 lib/puppet/parser/functions/ensure_prefix.rb
  58. +1 −1 manifests/dev.pp
  59. +1 −1 manifests/pear.pp
  60. +1 −1 manifests/phpunit.pp
  61. +2 −2 metadata.json
  62. +1 −0 spec/spec_helper.rb
  63. +1 −1 spec/spec_helper_acceptance.rb
11 changes: 7 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
with:

```sh
BEAKER_setfile=debian11-64 bundle exec rake beaker
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu1804
* ubuntu2004
* debian10
* ubuntu2204
* debian11
* centos7
* centos8
* centos9
* almalinux8
* almalinux9
* fedora36

For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '6.0.0'
modulesync_config_version: '7.0.0'
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
inherit_from: .rubocop_todo.yml

# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

Expand Down
7 changes: 7 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-08-18 06:32:34 UTC using RuboCop version 1.50.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v10.0.0](https://github.com/voxpupuli/puppet-php/tree/v10.0.0) (2023-09-22)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v9.0.0...v10.0.0)

**Breaking changes:**

- switch to stdlib namespaced functions, require stdlib 9.x [\#699](https://github.com/voxpupuli/puppet-php/pull/699) ([tuxmea](https://github.com/tuxmea))

**Closed issues:**

- \(Old?\) Documentation is not available [\#577](https://github.com/voxpupuli/puppet-php/issues/577)

**Merged pull requests:**

- README: fix links, fix typos, remove outdated info [\#698](https://github.com/voxpupuli/puppet-php/pull/698) ([kenyon](https://github.com/kenyon))
- remove YARD docs [\#697](https://github.com/voxpupuli/puppet-php/pull/697) ([kenyon](https://github.com/kenyon))

## [v9.0.0](https://github.com/voxpupuli/puppet-php/tree/v9.0.0) (2023-08-08)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v8.2.0...v9.0.0)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 6.0', :require => false
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
Expand Down
53 changes: 19 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
[![Puppet Forge](http://img.shields.io/puppetforge/v/puppet/php.svg)](https://forge.puppetlabs.com/puppet/php)
[![Build Status](https://travis-ci.org/voxpupuli/puppet-php.svg?branch=master)](https://travis-ci.org/voxpupuli/puppet-php)

## Current Status
As the original creators of `puppet-php` are no longer maintaining the module, it has been handed over into the care of Vox Pupuli.
Please be sure to update all your links to the new location.

# voxpupuli/php Puppet Module

Expand Down Expand Up @@ -52,7 +47,7 @@ class { '::php':
```

There are more configuration options available. Please refer to the
auto-generated documentation at http://php.puppet.mayflower.de/.
auto-generated documentation at [REFERENCE.md](REFERENCE.md).

### Defining `php.ini` settings

Expand Down Expand Up @@ -110,9 +105,8 @@ activated for all activated SAPIs.
}
```

See [the documentation](http://php.puppet.mayflower.de/php/extension.html)
of the `php::extension` resource for all available parameters and default
values.
See [the documentation](REFERENCE.md#php--extension) of the `php::extension`
resource for all available parameters and default values.

### Defining php-fpm pools

Expand All @@ -126,8 +120,8 @@ by default. Specify additional pools like so:
}
```

For an overview of all possible parameters for `php::fpm::pool` resources
please see [its documention](http://php.puppet.mayflower.de/php/fpm/pool.html).
For an overview of all possible parameters for `php::fpm::pool` resources please
see [its documentation](REFERENCE.md#php--fpm--pool).

### Overriding php-fpm user

Expand All @@ -143,7 +137,7 @@ By default, php-fpm is set up to run as Apache. If you need to customize that us
### PHP with one FPM pool per user

This will create one vhost. $users is an array of people having php files at
$fqdn/$user. This codesnipped uses voxpupuli/php and voxpupuli/nginx to create
$fqdn/$user. This code uses voxpupuli/php and voxpupuli/nginx to create
the vhost and one php fpm pool per user. This was tested on Archlinux with
nginx 1.13 and PHP 7.2.3.

Expand Down Expand Up @@ -195,12 +189,12 @@ $users.each |$user| {
```

### Alternative examples using Hiera

Alternative to the Puppet DSL code examples above, you may optionally define your PHP configuration using Hiera.

Below are all the examples you see above, but defined in YAML format for use with Hiera.

```yaml

---
php::ensure: latest
php::manage_repos: true
Expand Down Expand Up @@ -240,7 +234,7 @@ php::fpm::pools:
## Notes
### Inheriting configuration across mutliple Hiera sources
### Inheriting configuration across multiple Hiera sources
Configuration from Hiera such as `php::fpm::pools` is automatically
lookup up using the "first" merge method. This means that the first
Expand All @@ -255,22 +249,8 @@ lookup_options:
merge: hash
```

[`lookup_options`]: https://puppet.com/docs/puppet/6.4/hiera_merging.html#concept-2997
[`hash` or `deep` behaviors]: https://puppet.com/docs/puppet/6.4/hiera_merging.html#merge-behaviors

### Debian squeeze & Ubuntu precise come with PHP 5.3

On Debian-based systems, we use `php5enmod` to enable extension-specific
configuration. This script is only present in `php5` packages beginning with
version 5.4. Furthermore, PHP 5.3 is not supported by upstream anymore.

We strongly suggest you use a recent PHP version, even if you're using an
older though still supported distribution release. Our default is to have
`php::manage_repos` enabled to add apt sources for
[Dotdeb](http://www.dotdeb.org/) on Debian and
[ppa:ondrej/php5](https://launchpad.net/~ondrej/+archive/ubuntu/php5/) on
Ubuntu with packages for the current stable PHP version closely tracking
upstream.
[`lookup_options`]: https://puppet.com/docs/puppet/latest/hiera_merging.html#setting_lookup_options_to_refine_the_result_of_a_lookup
[`hash` or `deep` behaviors]: https://puppet.com/docs/puppet/latest/hiera_merging.html#merge_behaviors

### Ubuntu systems and Ondřej's PPA

Expand Down Expand Up @@ -353,11 +333,14 @@ if $facts['os']['family'] == 'RedHat' {
```

### RedHat/CentOS SCL Users

If you plan to use the SCL repositories with this module you must do the following adjustments:

#### General config
This ensures that the module will create configurations in the directory ``/etc/opt/rh/<php_version>/` (also in php.d/
for extensions). Anyway you have to manage the SCL repo's by your own.

This ensures that the module will create configurations in the directory
`/etc/opt/rh/<php_version>/` (also in php.d/ for extensions). Anyway you have to
manage the SCL repo's by your own.

```puppet
class { '::php::globals':
Expand All @@ -370,6 +353,7 @@ class { '::php::globals':
```

#### Extensions

Extensions in SCL are being installed with packages that cover 1 or more .so files. This is kinda incompatible with
this module, since this module specifies an extension by name and derives the name of the package and the config (.ini)
from it. To manage extensions of SCL packages you must use the following parameters:
Expand All @@ -386,10 +370,11 @@ class { '::php':
```

By this you tell the module to configure bz2 and calender while ensuring only the package `common`. Additionally to the
installation of 'common' the inifiles 'calender.ini' and 'bz2.ini' will be created by the scheme
installation of 'common' the ini files 'calender.ini' and 'bz2.ini' will be created by the scheme
`<config_file_prefix><extension_title>`.

A list of commonly used modules:

```puppet
{
extensions => {
Expand Down Expand Up @@ -477,7 +462,7 @@ and thus likely incomplete.
To run the tests install the ruby dependencies with `bundler` and execute
`rake`:

```
```bash
bundle install --path vendor/bundle
bundle exec rake
```
Expand Down
105 changes: 0 additions & 105 deletions docs/Puppet/Parser/Functions.html

This file was deleted.

Loading