tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4132 from Icinga/bugfix/vagrant 

Fix Vagrant provision failure
This commit is contained in:
Johannes Meyer 2020-04-24 09:23:34 +02:00 committed by GitHub
parent 4232a344b7 6fe5d54acb
commit 884edc273b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.puppet/files/etc/profile.d/env.sh
View File

@ -1,2 +1,2 @@
export PATH="/opt/rh/rh-php71/root/bin:$PATH" export PATH="/opt/rh/rh-php73/root/bin:$PATH"
export PATH="$PATH:/usr/local/bin" export PATH="$PATH:/usr/local/bin"

4
.puppet/modules/php/manifests/init.pp
View File

@ -22,12 +22,12 @@ class php {
include epel include epel
include scl include scl
package { 'rh-php71-php-fpm': package { 'rh-php73-php-fpm':
ensure => latest, ensure => latest,
notify => Service['apache'], notify => Service['apache'],
require => [ Class['scl'], Package['apache'] ], require => [ Class['scl'], Package['apache'] ],
} }
-> service { 'rh-php71-php-fpm': -> service { 'rh-php73-php-fpm':
ensure => running, ensure => running,
enable => true, enable => true,
alias => 'php-fpm', alias => 'php-fpm',

4
.puppet/modules/php/manifests/phpd.pp
View File

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

26
.puppet/profiles/icingaweb2_dev/manifests/init.pp
View File

@ -22,17 +22,17 @@ class icingaweb2_dev (
# TODO(el): icinga-gui is not a icingaweb2_dev package # TODO(el): icinga-gui is not a icingaweb2_dev package
package { [ package { [
'rh-php71-php-cli', 'rh-php73-php-cli',
'rh-php71-php-gd', 'rh-php73-php-gd',
'rh-php71-php-intl', 'rh-php73-php-intl',
'rh-php71-php-pdo', 'rh-php73-php-pdo',
'rh-php71-php-mysqlnd', 'rh-php73-php-mysqlnd',
'rh-php71-php-pgsql', 'rh-php73-php-pgsql',
'rh-php71-php-ldap', 'rh-php73-php-ldap',
'rh-php71-php-xml', 'rh-php73-php-xml',
'rh-php71-php-mbstring', 'rh-php73-php-mbstring',
'sclo-php71-php-pecl-xdebug', 'rh-php73-php-pecl-xdebug',
'sclo-php71-php-pecl-imagick', 'sclo-php73-php-pecl-imagick',
'php-phpunit-PHPUnit' 'php-phpunit-PHPUnit'
]: ]:
ensure => latest, ensure => latest,
@ -154,7 +154,7 @@ class icingaweb2_dev (
ensure => latest, ensure => latest,
} }
-> exec { 'move-mockery-to-opt': -> exec { 'move-mockery-to-opt':
command => 'cp -R /usr/share/php/Mockery* /opt/rh/rh-php71/root/usr/share/php/', command => 'cp -R /usr/share/php/Mockery* /opt/rh/rh-php73/root/usr/share/php/',
unless => 'test -d /opt/rh/rh-php71/root/usr/share/php/Mockery' unless => 'test -d /opt/rh/rh-php73/root/usr/share/php/Mockery'
} }
} }