diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-01 13:01:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-01 13:01:50 +0200 |
| commit | dcafa6a7110081c9b2611219ccbbfb10788503b6 (patch) | |
| tree | 3bbadf41319862462fabd1830c27f32dd0e4cf20 | |
| parent | 0b843505e82182d821e51cda55195bb8c6eebb7e (diff) | |
| parent | 49ac98ffdb73ef9fbd4610b815ef43bc58b13a45 (diff) | |
| download | forums-dcafa6a7110081c9b2611219ccbbfb10788503b6.tar forums-dcafa6a7110081c9b2611219ccbbfb10788503b6.tar.gz forums-dcafa6a7110081c9b2611219ccbbfb10788503b6.tar.bz2 forums-dcafa6a7110081c9b2611219ccbbfb10788503b6.tar.xz forums-dcafa6a7110081c9b2611219ccbbfb10788503b6.zip | |
Merge pull request #5659 from rubencm/ticket/16131
[ticket/16131] Force vagrant to install phpBB with php7.2
| -rwxr-xr-x | vagrant/after.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vagrant/after.sh b/vagrant/after.sh index cebbcd67d3..5980e5c334 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -1,12 +1,13 @@ #!/bin/sh +PHP_VERSION="7.2" PHPBB_PATH="/home/vagrant/phpbb" PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php" PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml" # Ensure composer deps are installed cd ${PHPBB_PATH}/phpBB -php ../composer.phar install +php${PHP_VERSION} ../composer.phar install # Backup and remove current config.php file if [ -e ${PHPBB_CONFIG} ] @@ -16,7 +17,7 @@ then fi # Install phpBB -php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} +php${PHP_VERSION} ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} # Add DEBUG mode to phpBB to remove annoying installer warnings echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} @@ -25,12 +26,12 @@ echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} # Update the PHP memory limits (enough to allow phpunit tests to run) -sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.2/fpm/php.ini +sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/${PHP_VERSION}/fpm/php.ini # Fix for urls with app.php -sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/7.2/fpm/php.ini +sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/${PHP_VERSION}/fpm/php.ini # Restart php-fpm to apply php.ini changes -systemctl restart php7.2-fpm.service +systemctl restart php${PHP_VERSION}-fpm.service echo "Your board is ready at http://192.168.10.10/" |