From 4282cf459ec1246ca5a92d4b82ae673695ff382e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 26 Mar 2017 16:31:59 -0700 Subject: [ticket/15153] Update to newer homestead for vagrant PHPBB3-15153 --- vagrant/after.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index aadb7e7492..9526698593 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -2,32 +2,39 @@ 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 cd ${PHPBB_PATH}/phpBB php ../composer.phar install -# Backup current config.php file +# Backup and remove current config.php file if [ -e ${PHPBB_CONFIG} ] then cp --backup=numbered ${PHPBB_CONFIG} ${PHPBB_CONFIG}.bak + rm -rf ${PHPBB_CONFIG} fi -# Delete any sqlite db and config file -rm -rf /tmp/phpbb.sqlite3 -rm -rf ${PHPBB_CONFIG} +# 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 -sudo chown -R vagrant /tmp/phpbb.sqlite3 +if [ -e ${PHPBB_SQLITE} ] +then + sudo chown -R vagrant ${PHPBB_SQLITE} +fi # Add DEBUG mode to phpBB to remove annoying installer warnings sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG} # Update the PHP memory limits (enough to allow phpunit tests to run) -sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php5/fpm/php.ini +sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/7.1/fpm/php.ini echo "Your board is ready at http://192.168.10.10/" -- cgit v1.2.1 From acab3b048d6c94731f5d453b9f78cdb42bba80ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 12 Jul 2017 11:03:36 +0200 Subject: [ticket/15269] Set development environment and enable all debugs with vagrant PHPBB3-15269 --- vagrant/after.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index 9526698593..1a14adc109 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -32,7 +32,16 @@ then fi # Add DEBUG mode to phpBB to remove annoying installer warnings -sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG} +echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} + +# Change environment to development +sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} + +# Display load time +sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG} + +# Enable debug container +sed -i '/^.*DEBUG_CONTAINER.*$/s/\/\/[[:blank:]]*//' ${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 -- cgit v1.2.1 From 3f3d88696be93e435fa91724134592e0ee363a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 12 Jul 2017 11:51:57 +0200 Subject: [ticket/15269] Remove comment only if is the beginning of a line PHPBB3-15269 --- vagrant/after.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index 1a14adc109..63503d9981 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -38,10 +38,10 @@ echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} # Display load time -sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG} +sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG} # Enable debug container -sed -i '/^.*DEBUG_CONTAINER.*$/s/\/\/[[:blank:]]*//' ${PHPBB_CONFIG} +sed -i '/^.*DEBUG_CONTAINER.*$/s/^\/\/[[:blank:]]*//' ${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 -- cgit v1.2.1 From 560704c9f33c1e315e1dc973785590ad130231a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 17 Jul 2017 21:09:35 +0200 Subject: [ticket/15269] Don't enable DEBUG_CONTAINER by default PHPBB3-15269 --- vagrant/after.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index 63503d9981..909d2d51f7 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -40,9 +40,6 @@ sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} # Display load time sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${PHPBB_CONFIG} -# Enable debug container -sed -i '/^.*DEBUG_CONTAINER.*$/s/^\/\/[[:blank:]]*//' ${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 -- cgit v1.2.1 From 5153413f7afd612b68cc70d93548977c99589fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 20 Dec 2017 20:35:26 +0100 Subject: [ticket/15400] Make app.php routes work in vagrant PHPBB3-15400 --- vagrant/after.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index 909d2d51f7..03008a88d0 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -43,4 +43,8 @@ sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${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 + echo "Your board is ready at http://192.168.10.10/" -- cgit v1.2.1 From 139eb17bb729763ab670fb239c77db02e29920f6 Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 18 Jun 2018 20:35:01 +0200 Subject: [ticket/12624] Add debug.load_time parameter PHPBB3-12624 --- vagrant/after.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'vagrant/after.sh') diff --git a/vagrant/after.sh b/vagrant/after.sh index 03008a88d0..3b56777a4e 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -37,9 +37,6 @@ echo "@define('DEBUG', true);" >> ${PHPBB_CONFIG} # Change environment to development sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} -# Display load time -sed -i '/^.*PHPBB_DISPLAY_LOAD_TIME.*$/s/^\/\/[[:blank:]]*//' ${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 -- cgit v1.2.1 From c2841cb6e263f0e20d2f01529057af82f79e5f0b Mon Sep 17 00:00:00 2001 From: rubencm Date: Mon, 13 May 2019 18:34:59 +0000 Subject: [ticket/16057] Fix vagrant in 3.3 PHPBB3-16057 --- vagrant/after.sh | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'vagrant/after.sh') 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/" -- cgit v1.2.1 From d639e107eccda52e4e39331d92ce3f840c855a55 Mon Sep 17 00:00:00 2001 From: rubencm Date: Wed, 15 May 2019 23:07:29 +0000 Subject: [ticket/16057] Enable url rewrite and composer.json rule PHPBB3-16057 --- vagrant/after.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vagrant/after.sh') 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} -- cgit v1.2.1 From 84ce92896e38ed36d252baac8d8626a956e2b86a Mon Sep 17 00:00:00 2001 From: rubencm Date: Fri, 17 May 2019 20:58:54 +0000 Subject: [ticket/16057] Enable cgi.fix_pathinfo in php.ini PHPBB3-16057 --- vagrant/after.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'vagrant/after.sh') 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/" -- cgit v1.2.1 From 49ac98ffdb73ef9fbd4610b815ef43bc58b13a45 Mon Sep 17 00:00:00 2001 From: rubencm Date: Wed, 14 Aug 2019 12:23:00 +0000 Subject: [ticket/16131] Force vagrant to install phpBB with php7.2 PHPBB3-16131 --- vagrant/after.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'vagrant/after.sh') 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/" -- cgit v1.2.1