Mercurial > repos > other > Puppet

changeset 335:aa9f570d6a9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to PHP 7.4 now that NextCloud has reached v18 7.3 only lasted until December 2020 with active support. 7.4 is good until December 2021 with security until 2022.
author IBBoard <dev@ibboard.co.uk>
date Sun, 22 Mar 2020 19:41:50 +0000
parents ee4760967d2f
children 43e11af9c85d
files manifests/templates.pp
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sun Mar 15 20:02:35 2020 +0000
+++ b/manifests/templates.pp	Sun Mar 22 19:41:50 2020 +0000
@@ -347,7 +347,6 @@
 		default_extra_tlds => [ 'com' ],
 	}
 
-	# Use Remi's PHP 7.3 for now - 7.4 is still VERY new
 	$php_suffix = ''
 	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
 		yumrepo { 'remirepo-safe':
@@ -381,8 +380,8 @@
 			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
 		}
 		yumrepo { 'remirepo-php':
-			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/mirror',
-			descr => "PHP7.3 for CentOS from Remi",
+			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php74/mirror',
+			descr => "PHP7.4 for CentOS from Remi",
 			enabled => 1,
 			failovermethod => 'priority',
 			gpgcheck => 1,
@@ -399,7 +398,7 @@
 	class { 'website::php':
 		suffix => $php_suffix, 
 		opcache => 'opcache',
-		module => ($operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0) ? { true => 'remi-7.3', default => undef },
+		module => ($operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0) ? { true => 'remi-7.4', default => undef },
 		extras => [ 'process', 'intl', 'pecl-imagick', 'bcmath', 'pecl-zip', 'json' ],
 	}