From c2841cb6e263f0e20d2f01529057af82f79e5f0b Mon Sep 17 00:00:00 2001 From: rubencm Date: Mon, 13 May 2019 18:34:59 +0000 Subject: [PATCH 1/4] [ticket/16057] Fix vagrant in 3.3 PHPBB3-16057 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 2 +- vagrant/after.sh | 19 +------------------ vagrant/bootstrap.yaml | 6 ++---- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index f42b6f268d..396c0cc5ab 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -53,7 +53,7 @@ "require-dev": { "fabpot/goutte": "~3.2", "facebook/webdriver": "~1.6", - "laravel/homestead": "~7.0", + "laravel/homestead": "~7.20", "phing/phing": "~2.4", "phpunit/dbunit": "~4.0", "phpunit/phpunit": "^7.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 1759288199..85a497b41e 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c098125fbe2261605adf47a875fe439b", + "content-hash": "582245335dd7dcf3d232f542c14f59d5", "packages": [ { "name": "bantu/ini-get-wrapper", diff --git a/vagrant/after.sh b/vagrant/after.sh index 3b56777a4e..981af5d0ab 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,6 @@ 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 - -# 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 +sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.2/fpm/php.ini 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 From d639e107eccda52e4e39331d92ce3f840c855a55 Mon Sep 17 00:00:00 2001 From: rubencm Date: Wed, 15 May 2019 23:07:29 +0000 Subject: [PATCH 2/4] [ticket/16057] Enable url rewrite and composer.json rule PHPBB3-16057 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 2 +- vagrant/after.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 396c0cc5ab..ed6b248b8b 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -53,7 +53,7 @@ "require-dev": { "fabpot/goutte": "~3.2", "facebook/webdriver": "~1.6", - "laravel/homestead": "~7.20", + "laravel/homestead": "~6.6 || ~7.0", "phing/phing": "~2.4", "phpunit/dbunit": "~4.0", "phpunit/phpunit": "^7.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 85a497b41e..ec41dcf578 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "582245335dd7dcf3d232f542c14f59d5", + "content-hash": "9309375ae30bef17186f4926aa03d32c", "packages": [ { "name": "bantu/ini-get-wrapper", diff --git a/vagrant/after.sh b/vagrant/after.sh index 981af5d0ab..23eedc4d8e 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -18,6 +18,9 @@ fi # Install phpBB php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} +# Enable mod rewrite +php ${PHPBB_PATH}/phpBB/bin/phpbbcli.php config:set enable_mod_rewrite 1 + # Add DEBUG mode to phpBB to remove annoying installer warnings echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} From dd3330d7c99011832fe5a058eec8e5c5c3f25782 Mon Sep 17 00:00:00 2001 From: rubencm Date: Wed, 15 May 2019 23:22:02 +0000 Subject: [PATCH 3/4] [ticket/16057] Undo composer.json changes PHPBB3-16057 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index ed6b248b8b..f42b6f268d 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -53,7 +53,7 @@ "require-dev": { "fabpot/goutte": "~3.2", "facebook/webdriver": "~1.6", - "laravel/homestead": "~6.6 || ~7.0", + "laravel/homestead": "~7.0", "phing/phing": "~2.4", "phpunit/dbunit": "~4.0", "phpunit/phpunit": "^7.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index ec41dcf578..1759288199 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9309375ae30bef17186f4926aa03d32c", + "content-hash": "c098125fbe2261605adf47a875fe439b", "packages": [ { "name": "bantu/ini-get-wrapper", From 84ce92896e38ed36d252baac8d8626a956e2b86a Mon Sep 17 00:00:00 2001 From: rubencm Date: Fri, 17 May 2019 20:58:54 +0000 Subject: [PATCH 4/4] [ticket/16057] Enable cgi.fix_pathinfo in php.ini PHPBB3-16057 --- vagrant/after.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vagrant/after.sh b/vagrant/after.sh index 23eedc4d8e..cebbcd67d3 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -18,9 +18,6 @@ fi # Install phpBB php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} -# Enable mod rewrite -php ${PHPBB_PATH}/phpBB/bin/phpbbcli.php config:set enable_mod_rewrite 1 - # Add DEBUG mode to phpBB to remove annoying installer warnings echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} @@ -30,4 +27,10 @@ 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 +# Fix for urls with app.php +sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/7.2/fpm/php.ini + +# 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/"