[ticket/15153] Update to newer homestead for vagrant

PHPBB3-15153
This commit is contained in:
Matt Friedman 2017-03-26 16:31:59 -07:00 committed by Marc Alexander
parent 228e0f58a8
commit 4282cf459e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 21 additions and 14 deletions

View file

@ -52,7 +52,7 @@
"require-dev": { "require-dev": {
"fabpot/goutte": "~3.1", "fabpot/goutte": "~3.1",
"facebook/webdriver": "~1.1", "facebook/webdriver": "~1.1",
"laravel/homestead": "~3.0", "laravel/homestead": "~4.0",
"phing/phing": "2.4.*", "phing/phing": "2.4.*",
"phpunit/dbunit": "~2.0", "phpunit/dbunit": "~2.0",
"phpunit/phpunit": "~4.8", "phpunit/phpunit": "~4.8",

14
phpBB/composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "84320427da5d1b9072b8fed14905435a", "hash": "c53f2fa544168309d695bb1855c98c24",
"content-hash": "46539387741e2f185eebfa9e9c14ff84", "content-hash": "4bc93e90a4852f936c13986c3823831b",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",
@ -1839,16 +1839,16 @@
}, },
{ {
"name": "laravel/homestead", "name": "laravel/homestead",
"version": "v3.0.2", "version": "v4.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/homestead.git", "url": "https://github.com/laravel/homestead.git",
"reference": "705449c3dbedbded4bd4f3ed725303c69253cad4" "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/homestead/zipball/705449c3dbedbded4bd4f3ed725303c69253cad4", "url": "https://api.github.com/repos/laravel/homestead/zipball/a1bcbde2462d8ac1fa608cd6f00b46623aabd705",
"reference": "705449c3dbedbded4bd4f3ed725303c69253cad4", "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1881,7 +1881,7 @@
} }
], ],
"description": "A virtual machine for web artisans.", "description": "A virtual machine for web artisans.",
"time": "2016-02-16 22:31:00" "time": "2017-02-07 19:06:26"
}, },
{ {
"name": "phing/phing", "name": "phing/phing",

View file

@ -2,32 +2,39 @@
PHPBB_PATH="/home/vagrant/phpbb" PHPBB_PATH="/home/vagrant/phpbb"
PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php" PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php"
PHPBB_SQLITE="/tmp/phpbb.sqlite3"
PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml" PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml"
# Ensure composer deps are installed # Ensure composer deps are installed
cd ${PHPBB_PATH}/phpBB cd ${PHPBB_PATH}/phpBB
php ../composer.phar install php ../composer.phar install
# Backup current config.php file # Backup and remove current config.php file
if [ -e ${PHPBB_CONFIG} ] if [ -e ${PHPBB_CONFIG} ]
then then
cp --backup=numbered ${PHPBB_CONFIG} ${PHPBB_CONFIG}.bak cp --backup=numbered ${PHPBB_CONFIG} ${PHPBB_CONFIG}.bak
rm -rf ${PHPBB_CONFIG}
fi fi
# Delete any sqlite db and config file # Delete any sqlite db
rm -rf /tmp/phpbb.sqlite3 if [ -e ${PHPBB_SQLITE} ]
rm -rf ${PHPBB_CONFIG} then
rm -rf ${PHPBB_SQLITE}
fi
# Install phpBB # Install phpBB
php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL} php ${PHPBB_PATH}/phpBB/install/phpbbcli.php install ${PHPBB_INSTALL}
# Update sqlite db file permissions # 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 # Add DEBUG mode to phpBB to remove annoying installer warnings
sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG} sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG}
# Update the PHP memory limits (enough to allow phpunit tests to run) # 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/" echo "Your board is ready at http://192.168.10.10/"