Mercurial > repos > other > Puppet

changeset 416:b185498177ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 6421c6f77eb8 - Add SOAP Something got lost in the history, despite supposedly being linear
author IBBoard <dev@ibboard.co.uk>
date Sat, 08 Oct 2022 14:35:13 +0100
parents de6f43c2df66
children ebf985c99a57
files manifests/templates.pp
diffstat 1 files changed, 20 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sat Oct 08 12:19:23 2022 +0100
+++ b/manifests/templates.pp	Sat Oct 08 14:35:13 2022 +0100
@@ -420,6 +420,9 @@
 
 	if $operatingsystem == 'CentOS' {
 		$php_suffix = ''
+		$variant_prefix = ''
+		$extra_prefix = 'pecl-'
+		$extra_extras = { 'process' => {} }
 		if versioncmp($operatingsystemrelease, '8') >= 0 {
 			yumrepo { 'remirepo-safe':
 				mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/$basearch/mirror',
@@ -468,13 +471,29 @@
 	}
 	elsif $operatingsystem == 'Ubuntu' {
 		$php_suffix = ''
+		$variant_prefix = 'php-'
+		$extra_prefix = ''
+		$extra_extras = {}
 	}
 
 	#Configure the PHP version to use
 	class { 'website::php':
 		suffix => $php_suffix,
 		module => ($operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0) ? { true => 'remi-7.4', default => undef },
-		extras => [ 'process', 'intl', 'pecl-imagick', 'bcmath', 'pecl-zip', 'json', 'pecl-apcu', 'gmp', 'enchant', 'soap' ],
+		extras => {
+			'intl' => {},
+			"${extra_prefix}imagick" => {
+				package_prefix => $variant_prefix
+			},
+			'bcmath' => {},
+			"${extra_prefix}zip" => {},
+			'json' => {},
+			"${extra_prefix}apcu" => {
+				package_prefix => $variant_prefix
+			},
+			'gmp' => {},
+			'enchant' => {}
+		} + $extra_extras,
 	}
 
 	#Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user