makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4772 from VSEphpbb/ticket/15153

Browse source 
[ticket/15153] Update to newer homestead for vagrant
This commit is contained in:
Marc Alexander 2017-03-27 08:14:09 +02:00 • committed by GitHub
commit c95a4820b5
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/composer.json
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.1", "phpunit/phpunit": "^4.1",

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": "8541642eb4b706f15c466e0dd547a7fa", "hash": "c53f2fa544168309d695bb1855c98c24",
"content-hash": "68fd1a0bc57151f27948642c75b08114", "content-hash": "4bc93e90a4852f936c13986c3823831b",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",
@ -1880,16 +1880,16 @@
}, },
{ {
"name": "laravel/homestead", "name": "laravel/homestead",
"version": "v3.1.0", "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": "7924ab4e27bbeb17dadcc2fc6a40659275bbfb0a" "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/homestead/zipball/7924ab4e27bbeb17dadcc2fc6a40659275bbfb0a", "url": "https://api.github.com/repos/laravel/homestead/zipball/a1bcbde2462d8ac1fa608cd6f00b46623aabd705",
"reference": "7924ab4e27bbeb17dadcc2fc6a40659275bbfb0a", "reference": "a1bcbde2462d8ac1fa608cd6f00b46623aabd705",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1922,7 +1922,7 @@
} }
], ],
"description": "A virtual machine for web artisans.", "description": "A virtual machine for web artisans.",
"time": "2016-11-29 16:43:51" "time": "2017-02-07 19:06:26"
}, },
{ {
"name": "phing/phing", "name": "phing/phing",

19
vagrant/after.sh
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/"