Mercurial > repos > other > Puppet

changeset 110:be2b30b17a4c puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to PHP 7 from Webtatic FIXME: Might as well drop support for CentOS 6 as I don't test it any more
author IBBoard <dev@ibboard.co.uk>
date Tue, 31 May 2016 22:02:15 +0100
parents 019968cfda31
children 501afb45ffc7
files manifests/templates.pp modules/website/files/php.conf
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Tue May 31 22:00:56 2016 +0100
+++ b/manifests/templates.pp	Tue May 31 22:02:15 2016 +0100
@@ -186,7 +186,7 @@
 	}
 	yumrepo { 'webtatic':
 		mirrorlist => 'http://mirror.webtatic.com/yum/el$releasever/$basearch/mirrorlist',
-		descr => "Extra Packages for Enterprise Linux",
+		descr => "Webtatic Packages for Enterprise Linux",
 		enabled => 1,
 		failovermethod => 'priority',
 		gpgcheck => 1,
@@ -363,9 +363,13 @@
 		default_tld => 'co.uk',
 		default_extra_tlds => [ 'com' ],
 	}
+
+	# Use Webtatic's PHP 7
+	$php_suffix = '70w'
+
 	#Configure the PHP version to use
 	class { 'website::php':
-		suffix => '55ibb', #IBBoard's rebuild of Webtatic's PHP 5.5
+		suffix => $php_suffix, 
 		opcache => 'opcache',
 		extras => [ 'process' ],
 	}
@@ -395,7 +399,7 @@
 		mysqlpassword => template('defaultusers/mysql-password'),
 		mysqlprefix => $mysqlpackage,
 		mysqlsuffix => $mysqlsuffix,
-		phpsuffix => '55ibb',
+		phpsuffix => $php_suffix,
 		phpmysqlsuffix => 'nd'
 	}
 }
--- a/modules/website/files/php.conf	Tue May 31 22:00:56 2016 +0100
+++ b/modules/website/files/php.conf	Tue May 31 22:02:15 2016 +0100
@@ -5,16 +5,16 @@
 # easy for developers to write dynamically generated webpages.
 #
 <IfModule !worker.c>
-  LoadModule php5_module modules/libphp5.so
+  LoadModule php7_module modules/libphp7.so
 </IfModule>
 <IfModule worker.c>
-  LoadModule php5_module modules/libphp5-zts.so
+  LoadModule php7_module modules/libphp7-zts.so
 </IfModule>
 
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script .php
+AddHandler php7-script .php
 AddType text/html .php
 
 #