Configuration for Vagrant running Ubuntu 14.04

[friendica.git] / doc / Vagrant.md

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 979c5c49b6ae50b081cf32ccff48dc44abb13900..4bc9e6c54d985ba3f57a0dd6711eed42afb8e64c 100644 (file)
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -8,20 +8,24 @@ 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](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 (an Ubuntu 14.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.
 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.
 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.
 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.
+5. Open 192.168.22.10 in a browser.

 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).
 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.
 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
 8. Commit and push your changes directly back to Github.
 
 If you want to stop vagrant after finishing your work, run the following command


@@ -30,13 +34,7 @@ If you want to stop vagrant after finishing your work, run the following command
 
 in the development directory.
 
 
 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
 You will then have the following accounts to login:
 
   * admin, password admin


@@ -46,3 +44,10 @@ You will then have the following accounts to login:
   * 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/).
   * 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/).

+
+**Important notice:**
+If you already had an Ubuntu 12.04 Vagrant VM, please run 
+
+       $> vagrant destroy
+
+before starting the new 14.04 machine.