Merge branch '3.3.x'

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
 
-# Make routes work in vagrant (https://tracker.phpbb.com/browse/PHPBB3-15400)
+# Fix for urls with app.php
-sed -i '/^.*try_files.*$/s/index/app/' /etc/nginx/sites-enabled/phpbb.app
+sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/7.2/fpm/php.ini
-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/"

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