X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FVagrant.md;h=a224ebafc2d6cc8e23b4a247a0ef3581625478d9;hb=1c7f4e3c6331f8ad7b1987f33a17074908ad41eb;hp=979c5c49b6ae50b081cf32ccff48dc44abb13900;hpb=5837fd4f817c06a723af9ad27298b6bef40e37e5;p=friendica.git

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 979c5c49b6..a224ebafc2 100644
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -8,20 +8,29 @@ 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.
+
+It brings an 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. Run "vagrant up" from inside the friendica clone:
+        $> vagrant up
 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".
+4. Run "vagrant ssh" to log into the virtual machine to log in to the VM:
+        $> vagrant ssh
+5. Open you test installation in a browser.
+Go to 192.168.22.10.
+The mysql database is called "friendica", the mysql user and password both are "friendica".
 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.
+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
@@ -29,14 +38,15 @@ If you want to stop vagrant after finishing your work, run the following command
 		$> vagrant halt
 
 in the development directory.
+This will not delete the virtual machine.
+9. To ultimately delete the virtual machine run
 
-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):
+        $> vagrant destroy
+        $> rm /vagrant/.htconfig.php
 
-		$> mysql -u root -p friendica < /vagrant/friendica_test_data.sql
+to make sure that you can start from scratch with another "vagrant up".
 
+The vagrant Friendica instance contains a test database.
 You will then have the following accounts to login:
 
   * admin, password admin