From a1aab85d44ec5ad032360389dded55162f9f3f8b Mon Sep 17 00:00:00 2001 From: Tarjei Huse Date: Wed, 15 Jul 2020 09:07:24 +0200 Subject: [PATCH 1/2] Update docs to reflect changes from the last 3 years I wanted to contribute back the info I got from #586 and I think this should do it :) --- README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1d21c338..d8e459cb 100644 --- a/README.md +++ b/README.md @@ -274,8 +274,19 @@ upstream. ### Ubuntu systems and Ondřej's PPA +To use a different PHP version than the Ubuntu one, you can install Ondřej's PPA and set the version explicitly: + +``` + class{ 'php::repo::ubuntu': }-> + class { '::php::globals': + php_version => '7.4', + } +``` + +#### Older versions of Ondřej's PPAs are deprecated + The older Ubuntu PPAs run by Ondřej have been deprecated (ondrej/php5, ondrej/php5.6) -in favor of a new PPA: ondrej/php which contains all 3 versions of PHP: 5.5, 5.6, and 7.0 +in favor of a new PPA: ondrej/php which contains many versions of PHP depending on the release. Here's an example in hiera of getting PHP 5.6 installed with php-fpm, pear/pecl, and composer: ```puppet @@ -287,8 +298,7 @@ php::pear: true php::phpunit: false ``` -If you do not specify a php version, in Ubuntu the default will be 7.0 if you are -running Xenial (16.04), otherwise PHP 5.6 will be installed (for other versions) +If you do not specify a php version, in Ubuntu the default will depend on the release you are using. ### Apache support From 76118e1591f5b8780a9413c7e117ae2de5b21f71 Mon Sep 17 00:00:00 2001 From: Tarjei Huse Date: Thu, 30 Jul 2020 08:37:08 +0200 Subject: [PATCH 2/2] Fix trailing space --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8e459cb..ddb4146c 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ upstream. ### Ubuntu systems and Ondřej's PPA -To use a different PHP version than the Ubuntu one, you can install Ondřej's PPA and set the version explicitly: +To use a different PHP version than the Ubuntu one, you can install Ondřej's PPA and set the version explicitly: ``` class{ 'php::repo::ubuntu': }->