Merge pull request #4132 from Icinga/bugfix/vagrant
Fix Vagrant provision failure
This commit is contained in:
commit
884edc273b
|
@ -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"
|
||||
|
|
|
@ -22,12 +22,12 @@ class php {
|
|||
include epel
|
||||
include scl
|
||||
|
||||
package { 'rh-php71-php-fpm':
|
||||
package { 'rh-php73-php-fpm':
|
||||
ensure => latest,
|
||||
notify => Service['apache'],
|
||||
require => [ Class['scl'], Package['apache'] ],
|
||||
}
|
||||
-> service { 'rh-php71-php-fpm':
|
||||
-> service { 'rh-php73-php-fpm':
|
||||
ensure => running,
|
||||
enable => true,
|
||||
alias => 'php-fpm',
|
||||
|
|
|
@ -14,9 +14,9 @@ define php::phpd {
|
|||
|
||||
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"),
|
||||
notify => Service['apache'],
|
||||
require => Package['rh-php71-php-fpm'],
|
||||
require => Package['rh-php73-php-fpm'],
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,17 +22,17 @@ class icingaweb2_dev (
|
|||
|
||||
# TODO(el): icinga-gui is not a icingaweb2_dev package
|
||||
package { [
|
||||
'rh-php71-php-cli',
|
||||
'rh-php71-php-gd',
|
||||
'rh-php71-php-intl',
|
||||
'rh-php71-php-pdo',
|
||||
'rh-php71-php-mysqlnd',
|
||||
'rh-php71-php-pgsql',
|
||||
'rh-php71-php-ldap',
|
||||
'rh-php71-php-xml',
|
||||
'rh-php71-php-mbstring',
|
||||
'sclo-php71-php-pecl-xdebug',
|
||||
'sclo-php71-php-pecl-imagick',
|
||||
'rh-php73-php-cli',
|
||||
'rh-php73-php-gd',
|
||||
'rh-php73-php-intl',
|
||||
'rh-php73-php-pdo',
|
||||
'rh-php73-php-mysqlnd',
|
||||
'rh-php73-php-pgsql',
|
||||
'rh-php73-php-ldap',
|
||||
'rh-php73-php-xml',
|
||||
'rh-php73-php-mbstring',
|
||||
'rh-php73-php-pecl-xdebug',
|
||||
'sclo-php73-php-pecl-imagick',
|
||||
'php-phpunit-PHPUnit'
|
||||
]:
|
||||
ensure => latest,
|
||||
|
@ -154,7 +154,7 @@ class icingaweb2_dev (
|
|||
ensure => latest,
|
||||
}
|
||||
-> exec { 'move-mockery-to-opt':
|
||||
command => 'cp -R /usr/share/php/Mockery* /opt/rh/rh-php71/root/usr/share/php/',
|
||||
unless => 'test -d /opt/rh/rh-php71/root/usr/share/php/Mockery'
|
||||
command => 'cp -R /usr/share/php/Mockery* /opt/rh/rh-php73/root/usr/share/php/',
|
||||
unless => 'test -d /opt/rh/rh-php73/root/usr/share/php/Mockery'
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue