Merge branch 'develop' of github.com:friendica/friendica into develop

[friendica.git] / doc / Vagrant.md

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index dec8112edcd2a0b9cc82e8df3dd0421c825e5ea8..136583c4d977b4f81ae827c4ea23bab87af54160 100644 (file)
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -3,6 +3,8 @@ Vagrant for Friendica Developers
 
 * [Home](help)
 
+**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:
 
 1. Install VirtualBox and vagrant.
@@ -13,3 +15,25 @@ Vagrant for Friendica Developers
 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.
 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
+
+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
+
+You will then have the following accounts to login:
+
+  * admin, password admin
+  * friendica1, password friendica
+  * 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. 
+
+For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).