diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-05-27 20:34:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-27 20:34:13 +0200 |
| commit | b9a40be9b402b059309c64680b65889a00e4d887 (patch) | |
| tree | 7caa483dcbfa47b3e3b2b2f32cd2f2772fef3449 | |
| parent | 00f639de7b10e2787d18b09526571c26c1486a90 (diff) | |
| parent | 84ce92896e38ed36d252baac8d8626a956e2b86a (diff) | |
| download | forums-b9a40be9b402b059309c64680b65889a00e4d887.tar forums-b9a40be9b402b059309c64680b65889a00e4d887.tar.gz forums-b9a40be9b402b059309c64680b65889a00e4d887.tar.bz2 forums-b9a40be9b402b059309c64680b65889a00e4d887.tar.xz forums-b9a40be9b402b059309c64680b65889a00e4d887.zip | |
Merge pull request #5591 from rubencm/ticket/16057
[ticket/16057] Fix vagrant in 3.3
| -rwxr-xr-x | vagrant/after.sh | 23 | ||||
| -rw-r--r-- | vagrant/bootstrap.yaml | 6 |
2 files changed, 8 insertions, 21 deletions
diff --git a/vagrant/after.sh b/vagrant/after.sh index 3b56777a4e..cebbcd67d3 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -2,7 +2,6 @@ PHPBB_PATH="/home/vagrant/phpbb" PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php" -PHPBB_SQLITE="/tmp/phpbb.sqlite3" PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml" # Ensure composer deps are installed @@ -16,21 +15,9 @@ then rm -rf ${PHPBB_CONFIG} fi -# Delete any sqlite db -if [ -e ${PHPBB_SQLITE} ] -then - rm -rf ${PHPBB_SQLITE} -fi - # Install phpBB php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} -# Update sqlite db file permissions -if [ -e ${PHPBB_SQLITE} ] -then - sudo chown -R vagrant ${PHPBB_SQLITE} -fi - # Add DEBUG mode to phpBB to remove annoying installer warnings echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} @@ -38,10 +25,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.1/fpm/php.ini +sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.2/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 -# Make routes work in vagrant (https://tracker.phpbb.com/browse/PHPBB3-15400) -sed -i '/^.*try_files.*$/s/index/app/' /etc/nginx/sites-enabled/phpbb.app -nginx -s reload +# Restart php-fpm to apply php.ini changes +systemctl restart php7.2-fpm.service echo "Your board is ready at http://192.168.10.10/" diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml index 1c2b265712..0877c506aa 100644 --- a/vagrant/bootstrap.yaml +++ b/vagrant/bootstrap.yaml @@ -14,18 +14,16 @@ keys: folders: - map: "." to: "/home/vagrant/phpbb" + php: "7.2" sites: - map: phpbb.app to: "/home/vagrant/phpbb/phpBB" + type: apache databases: - phpbb -variables: - - key: APP_ENV - value: local - # blackfire: # - id: foo # token: bar |