X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FVagrant.md;h=ec706e5c386531830d9b7118041368397de9e1d8;hb=288ad37c3c93bcc3f5f3409be095dba57deab7f4;hp=136583c4d977b4f81ae827c4ea23bab87af54160;hpb=caa21e6021dc2623aba8294f55279a31c94aab02;p=friendica.git

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 136583c4d9..ec706e5c38 100644
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -3,35 +3,52 @@ Vagrant for Friendica Developers
 
 * [Home](help)
 
-**Getting started**
+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. What you need to do:
+[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 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.
-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. 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. The mysql database is called "friendica", the mysql user and password both are "root".
+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. 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 <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).
-7. Check the changes in your browser in the VM. Debug via the "vagrant ssh" login.
+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 <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
-  * friendica1, password friendica
+  * friendica1, password friendica1
   * friendica2, password friendica2 and so on until friendica5
   * friendica1 is connected to all others. friendica1 has two groups: group1 with friendica2 and friendica4, group2 with friendica3 and friendica5.
   * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected.