Install PHP 7.1 from RedHat SCL

refs #2989
This commit is contained in:
Alexander A. Klimov 2018-01-11 18:07:40 +01:00
parent b6ea97090a
commit 2ac605800f
5 changed files with 46 additions and 4 deletions

View File

@ -9,6 +9,8 @@
# Requires: # Requires:
# #
# apache # apache
# epel
# scl
# #
# Sample Usage: # Sample Usage:
# #
@ -18,11 +20,16 @@ class php {
include apache include apache
include epel include epel
include scl
package { 'php': package { 'rh-php71-php-fpm':
ensure => latest, ensure => latest,
notify => Service['apache'], notify => Service['apache'],
require => Package['apache'], require => [ Class['scl'], Package['apache'] ],
}
-> service { 'rh-php71-php-fpm':
ensure => running,
enable => true,
} }
package { 'php-pecl-xdebug': package { 'php-pecl-xdebug':

View File

@ -17,6 +17,6 @@ define php::phpd {
file { "/etc/php.d/$name.ini": file { "/etc/php.d/$name.ini":
content => template("php/$name.ini.erb"), content => template("php/$name.ini.erb"),
notify => Service['apache'], notify => Service['apache'],
require => Package['php'], require => Package['rh-php71-php-fpm'],
} }
} }

View File

@ -0,0 +1,19 @@
# Class: scl
#
# This class installs centos-release-scl.
#
# Parameters:
#
# Actions:
#
# Requires:
#
# Sample Usage:
#
# include scl
#
class scl {
package { 'centos-release-scl':
ensure => latest,
}
}

View File

@ -21,7 +21,15 @@ class icingaweb2_dev (
} }
# TODO(el): icinga-gui is not a icingaweb2_dev package # TODO(el): icinga-gui is not a icingaweb2_dev package
package { [ 'php-gd', 'php-intl', 'php-pdo', 'php-ldap', 'php-phpunit-PHPUnit' ]: package { [
'rh-php71-php-gd',
'rh-php71-php-intl',
'rh-php71-php-pdo',
'rh-php71-php-mysqlnd',
'rh-php71-php-pgsql',
'rh-php71-php-ldap',
'php-phpunit-PHPUnit'
]:
ensure => latest, ensure => latest,
notify => Service['apache'], notify => Service['apache'],
require => Class['icinga_packages'], require => Class['icinga_packages'],

View File

@ -18,8 +18,10 @@ Alias /<%= @web_path %> "/vagrant/public"
</IfModule> </IfModule>
SetEnv ICINGAWEB_CONFIGDIR <%= @config %> SetEnv ICINGAWEB_CONFIGDIR <%= @config %>
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
EnableSendfile Off EnableSendfile Off
DirectoryIndex index.php
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
@ -31,6 +33,12 @@ Alias /<%= @web_path %> "/vagrant/public"
RewriteRule ^.*$ index.php [NC,L] RewriteRule ^.*$ index.php [NC,L]
</IfModule> </IfModule>
<FilesMatch "\.php$">
SetHandler "proxy:fcgi://127.0.0.1:9000"
ErrorDocument 503 /icingaweb2/error_unavailable.html
</FilesMatch>
<IfModule !mod_rewrite.c> <IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html DirectoryIndex error_norewrite.html
ErrorDocument 404 /error_norewrite.html ErrorDocument 404 /error_norewrite.html