From c2841cb6e263f0e20d2f01529057af82f79e5f0b Mon Sep 17 00:00:00 2001
From: rubencm <rubencm@gmail.com>
Date: Mon, 13 May 2019 18:34:59 +0000
Subject: [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
-- 
cgit v1.2.1