Mercurial > repos > other > Puppet

changeset 413:6421c6f77eb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add PHP SOAP dependency Probably required by WooCommerce to talk to PayPal
author IBBoard <dev@ibboard.co.uk>
date Sat, 08 Oct 2022 12:18:02 +0100
parents 731107a67700
children 23eac935cffa
files manifests/templates.pp
diffstat 1 files changed, 1 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sat Oct 08 12:17:24 2022 +0100
+++ b/manifests/templates.pp	Sat Oct 08 12:18:02 2022 +0100
@@ -420,9 +420,6 @@
 
 	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',
@@ -471,29 +468,13 @@
 	}
 	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 => {
-			'intl' => {},
-			"${extra_prefix}imagick" => {
-				package_prefix => $variant_prefix
-			},
-			'bcmath' => {},
-			"${extra_prefix}zip" => {},
-			'json' => {},
-			"${extra_prefix}apcu" => {
-				package_prefix => $variant_prefix
-			},
-			'gmp' => {},
-			'enchant' => {}
-		} + $extra_extras,
+		extras => [ 'process', 'intl', 'pecl-imagick', 'bcmath', 'pecl-zip', 'json', 'pecl-apcu', 'gmp', 'enchant', 'soap' ],
 	}
 
 	#Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user