diff options
| author | Matt Friedman <maf675@gmail.com> | 2017-03-26 16:31:59 -0700 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-06 22:02:16 +0200 |
| commit | 4282cf459ec1246ca5a92d4b82ae673695ff382e (patch) | |
| tree | a57a7e4764e72105d01dafa607d0c54139eba5a8 | |
| parent | 228e0f58a84049231f9cff881433b1b331f806ed (diff) | |
| download | forums-4282cf459ec1246ca5a92d4b82ae673695ff382e.tar forums-4282cf459ec1246ca5a92d4b82ae673695ff382e.tar.gz forums-4282cf459ec1246ca5a92d4b82ae673695ff382e.tar.bz2 forums-4282cf459ec1246ca5a92d4b82ae673695ff382e.tar.xz forums-4282cf459ec1246ca5a92d4b82ae673695ff382e.zip | |
[ticket/15153] Update to newer homestead for vagrant
PHPBB3-15153
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 14 | ||||
| -rwxr-xr-x | vagrant/after.sh | 19 |
3 files changed, 21 insertions, 14 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 06034f354c..c9eb7510b9 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -52,7 +52,7 @@ "require-dev": { "fabpot/goutte": "~3.1", "facebook/webdriver": "~1.1", - "laravel/homestead": "~3.0", + "laravel/homestead": "~4.0", "phing/phing": "2.4.*", "phpunit/dbunit": "~2.0", "phpunit/phpunit": "~4.8", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index abf093b06e..a646ddc4b5 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "84320427da5d1b9072b8fed14905435a", - "content-hash": "46539387741e2f185eebfa9e9c14ff84", + "hash": "c53f2fa544168309d695bb1855c98c24", + "content-hash": "4bc93e90a4852f936c13986c3823831b", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -1839,16 +1839,16 @@ }, { "name": "laravel/homestead", - "version": "v3.0.2", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/laravel/homestead.git", - "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4" + "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/homestead/zipball/705449c3dbedbded4bd4f3ed725303c69253cad4", - "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4", + "url": "https://api.github.com/repos/laravel/homestead/zipball/a1bcbde2462d8ac1fa608cd6f00b46623aabd705", + "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705", "shasum": "" }, "require": { @@ -1881,7 +1881,7 @@ } ], "description": "A virtual machine for web artisans.", - "time": "2016-02-16 22:31:00" + "time": "2017-02-07 19:06:26" }, { "name": "phing/phing", 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/" |