diff options
| -rw-r--r-- | Vagrantfile | 3 | ||||
| -rw-r--r-- | phpBB/composer.json | 2 | ||||
| -rw-r--r-- | phpBB/composer.lock | 25 | ||||
| -rw-r--r-- | phpBB/docs/vagrant.md | 29 | ||||
| -rwxr-xr-x | vagrant/after.sh | 3 | ||||
| -rw-r--r-- | vagrant/bootstrap.yaml | 4 |
6 files changed, 35 insertions, 31 deletions
diff --git a/Vagrantfile b/Vagrantfile index d8ba9b3137..ab225c9ad9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,6 @@ VAGRANTFILE_API_VERSION ||= "2" confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__)) homesteadYamlPath = "vagrant/bootstrap.yaml" -homesteadJsonPath = "vagrant/bootstrap.json" afterScriptPath = "vagrant/after.sh" aliasesPath = "vagrant/aliases" @@ -18,8 +17,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if File.exists? homesteadYamlPath then Homestead.configure(config, YAML::load(File.read(homesteadYamlPath))) - elsif File.exists? homesteadJsonPath then - Homestead.configure(config, JSON.parse(File.read(homesteadJsonPath))) end if File.exists? afterScriptPath then diff --git a/phpBB/composer.json b/phpBB/composer.json index 21ac81b54f..99121e0a08 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -52,7 +52,7 @@ "require-dev": { "fabpot/goutte": "~2.0", "facebook/webdriver": "~1.1", - "laravel/homestead": "~3.0", + "laravel/homestead": "~2.2", "phing/phing": "2.4.*", "phpunit/dbunit": "1.3.*", "phpunit/phpunit": "4.1.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 8594df288f..ac0d01e648 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": "d17edf84ae8880e813086b6d819b673e", - "content-hash": "6f5504e5ebda4ca805181bbf6c829f1f", + "hash": "0a51a3b7218cbf3a5fe6621729b72c05", + "content-hash": "396082a59d972dd35293fe73b0615e79", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -1974,32 +1974,27 @@ }, { "name": "laravel/homestead", - "version": "v3.0.2", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/laravel/homestead.git", - "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4" + "reference": "5008339af93bbb73efee53cbef9374c5d443c708" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/homestead/zipball/705449c3dbedbded4bd4f3ed725303c69253cad4", - "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4", + "url": "https://api.github.com/repos/laravel/homestead/zipball/5008339af93bbb73efee53cbef9374c5d443c708", + "reference": "5008339af93bbb73efee53cbef9374c5d443c708", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/console": "~2.3|~3.0", - "symfony/process": "~2.3|~3.0" + "php": ">=5.4", + "symfony/console": "~2.0", + "symfony/process": "~2.0" }, "bin": [ "homestead" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, "autoload": { "psr-4": { "Laravel\\Homestead\\": "src/" @@ -2016,7 +2011,7 @@ } ], "description": "A virtual machine for web artisans.", - "time": "2016-02-16 22:31:00" + "time": "2016-01-05 19:19:26" }, { "name": "michelf/php-markdown", diff --git a/phpBB/docs/vagrant.md b/phpBB/docs/vagrant.md index 1ebe90bb34..4a14045d30 100644 --- a/phpBB/docs/vagrant.md +++ b/phpBB/docs/vagrant.md @@ -2,7 +2,7 @@ phpBB includes support for Vagrant. This allows developers and contributors to run phpBB without the need to set up their own local web server with traditional WAMP/MAMP stacks. It also provides a consistent environment between developers for writing and debugging code changes more productively. -phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.2/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 7, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below). +phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 5.6, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below). ## Get Started @@ -14,7 +14,7 @@ phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.2/homestead) Vagra $ vagrant up ``` -* Access phpBB at `http://192.168.33.10/phpBB/` +* Access phpBB at `http://192.168.33.10/` * Username: **admin** * Password: **adminadmin** @@ -49,7 +49,7 @@ $ vagrant destroy By default, phpBB is pre-configured to install with a MySQL database. You can, however, switch to PostegreSQL or SQLite3 by editing the `phpbb-install-config.yml` file in the vagrant directory. The next time you run `vagrant up` (or `vagrant provision`) it will be installed under the new configuration. -If you prefer to access phpBB from the more friendly URL `http://phpbb.app/phpBB` then you must update your computer's hosts file. This file is typically located at `/etc/hosts` for Mac/Linux or `C:\Windows\System32\drivers\etc\hosts` for Windows. Open this file and add the following line to it, at the very bottom, and save. +If you prefer to access phpBB from the more friendly URL `http://phpbb.app` then you must update your computer's hosts file. This file is typically located at `/etc/hosts` for Mac/Linux or `C:\Windows\System32\drivers\etc\hosts` for Windows. Open this file and add the following line to it, at the very bottom, and save. ``` 192.168.10.10 phpbb.app @@ -57,7 +57,7 @@ If you prefer to access phpBB from the more friendly URL `http://phpbb.app/phpBB ## How it all works -When you vagrant up, the Laravel/Homestead box is transparently loaded as a Virtual Machine on your computer. Your local phpBB repository clone is mirrored/shared with the VM, so you can work on the phpBB code on your computer, and see the changes immediately when you browse to phpBB at the URL provided by the VM. +When you vagrant up, the Laravel/Homestead box is transparently loaded as a Virtual Machine on your computer (this may take several minutes the very first time while it downloads the VM image to your computer). Your local phpBB repository clone is mirrored/shared with the VM, so you can work on the phpBB code on your computer, and see the changes immediately when you browse to phpBB at the URL provided by the VM. This is very similar to traditional methods of working with a local WAMP/MAMP stack, except the webserver is now being provided by a VM of a Linux server. The advantages here are the exact same Linux server environment is being used by everybody who uses Vagrant with phpBB, so there will be consist behaviour unlike when everybody is developing on different versions of PHP, server configurations, etc. @@ -65,19 +65,24 @@ The environment is also "sandboxed" from your system. This means you don't need There are some caveats, however. You can only run one vagrant VM for the phpBB repository. And of course, the database will be destroyed when you vagrant destroy. If the database is important, you should SSH into your vagrant VM and export/import the DB as needed using SSH commands. -For example, to export/import a MySQL database (using phpBB's store directory): +For example, to export/import a MySQL database (using phpBB's `store` directory): SSH into the VM -``` + +```sh $ vagrant ssh ``` + Export MySQL: + +```sh +$ mysqldump -uhomestead -psecret phpbb > /home/vagrant/phpbb/phpBB/store/phpbb.sql ``` -$ mysqldump phpbb > /home/vagrant/phpbb/phpBB/store/phpbb.sql -``` + Import MySQL: -``` -$ mysql phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql + +```sh +$ mysql -uhomestead -psecret phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql ``` --- @@ -88,11 +93,10 @@ $ mysql phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql * Ubuntu 14.04 * Git -* PHP 7.0 +* PHP 5.6 * HHVM * Nginx * MySQL -* MariaDB * Sqlite3 * Postgres * Composer @@ -100,6 +104,7 @@ $ mysql phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql * Redis * Memcached * Beanstalkd +* Blackfire Profiler ### MySQL Access diff --git a/vagrant/after.sh b/vagrant/after.sh index 440f1bc49e..09a6fe25fa 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -27,4 +27,7 @@ sudo chown -R vagrant /tmp/phpbb.sqlite3 # 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 = 768M/" /etc/php5/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 06a6147b86..1c2b265712 100644 --- a/vagrant/bootstrap.yaml +++ b/vagrant/bootstrap.yaml @@ -22,6 +22,10 @@ sites: databases: - phpbb +variables: + - key: APP_ENV + value: local + # blackfire: # - id: foo # token: bar |