Merge remote-tracking branch 'upstream/develop' into baseurl

[friendica.git] / doc / Vagrant.md

diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 06c14ff761cda4dc54901691757bdfaeda204984..16088cd37e291f90a8e66438738cae93b3ac3342 100644 (file)
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -10,7 +10,7 @@ Getting started
 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.
 
-It brings an Debian Bullseye with PHP 7.4 and MariaDB 10.5.11.
+It brings an Debian Bullseye with PHP 8.0 and MariaDB 10.5.11.
 
 What you need to do:
 
@@ -18,19 +18,20 @@ What you need to do:
 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 `bin/dev` folder.
+Pull the PHP requirements with `bin/composer install`.
 3. Run `vagrant up` from inside the friendica clone.
 This will start the virtual machine.
-Be patient: When it runs for the first time, it downloads an Debian Server image and installs Friendica.
+Be patient: When it runs for the first time, it downloads a Debian Server image and installs Friendica.
 4. Run `vagrant ssh` to log into the virtual machine to log in to the VM in case you need to debug something on the server.
 5. Open you test installation in a browser.
-Go to friendica.local (or 192.168.22.10).
+Go to friendica.local (or 192.168.56.10).
 friendica.local is using a self-signed TLS certificate, so you will need to add an exception to trust the certificate the first time you are visiting the page.
 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.
 Find the Friendica log file `/vagrant/logfile.out` on the VM or in the `logfile.out` in you local Friendica directory.
-8. Commit and push your changes directly back to Github.
+8. Commit and push your changes directly back to GitHub.
 
 If you want to stop vagrant after finishing your work, run the following command
 
@@ -63,4 +64,6 @@ Stop the Vagrant VM and run the following command:
 
 On the next Vagrant up, the version problem should be fixed.
 
-For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
\ No newline at end of file
+If `friendica.local` is not resolved, you may need to add an entry to the `/etc/hosts` file (or similar configuration depending on the OS you are using).
+
+For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).