Merge pull request #3110 from tobiasd/20170127-translationdocs

[friendica.git] / doc / Vagrant.md

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 979c5c49b6ae50b081cf32ccff48dc44abb13900..ec706e5c386531830d9b7118041368397de9e1d8 100644 (file)
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -8,35 +8,43 @@ Getting started
 
 [Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers.
 No need to setup up a webserver, database etc. before actually starting.
-Vagrant creates a virtual machine (an Ubuntu 12.04) for you that you can just run inside VirtualBox and start to work directly on Friendica.
+Vagrant creates a virtual machine for you that you can just run inside VirtualBox and start to work directly on Friendica.
+You can choose between two different Ubuntu Linux versions:
+
+1. Ubuntu Trusty (14.04) with PHP 5.5.9 and MySQL 5.5.53
+2. Ubuntu Xenial (16.04) with PHP 7.0 and MySQL 5.7.16
+
 What you need to do:
 
 1. Install VirtualBox and vagrant.
+Please use an up-to-date vagrant version from https://www.vagrantup.com/downloads.html.
 2. Git clone your Friendica repository.
 Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
-3. Run "vagrant up" from inside the friendica clone.
+3. Choose the Ubuntu version you'll need und run "vagrant up <ubuntu-version>" from inside the friendica clone:
+        $> vagrant up trusty
+        $> vagrant up xenial
 Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
-4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
-5. Open 192.168.22.10 in a browser to finish the Friendica installation.
+4. Run "vagrant ssh <ubuntu-version>" to log into the virtual machine to log in to the VM:
+        $> vagrant ssh trusty
+        $> vagrant ssh xenial
+5. Open you test installation in a browser.
+If you selected an Ubuntu Trusty go to 192.168.22.10.
+If you started a Xenial machine go to 192.168.22.11.
 The mysql database is called "friendica", the mysql user and password both are "root".
 6. Work on Friendica's code in your git clone on your machine (not in the VM).
+Your local working directory is set up as a shared directory with the VM (/vagrant).
 7. Check the changes in your browser in the VM.
-Debug via the "vagrant ssh" login.
+Debug via the "vagrant ssh <ubuntu-version>" login.
+Find the Friendica log file /vagrant/logfile.out.
 8. Commit and push your changes directly back to Github.
 
 If you want to stop vagrant after finishing your work, run the following command
 
-               $> vagrant halt
+               $> vagrant halt <ubuntu-version>
 
 in the development directory.
 
-Import test data
-----------------
-
-If you want some test data in your vagrant Friendica instance import the database dump friendica_test_data.sql like so (inside the VM):
-
-               $> mysql -u root -p friendica < /vagrant/friendica_test_data.sql
-
+The vagrant Friendica instance contains a test database.
 You will then have the following accounts to login:
 
   * admin, password admin