Merge remote-tracking branch 'upstream/pull/4308'

[rails.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index 0155a3383b1cd7d69fb2e9f25858fcbb62dd8670..ed84eed57a823df9d000ac29a0d77979d224cb69 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -6,9 +6,11 @@ On Ubuntu, it should be as simple as:
 sudo apt-get install vagrant
 ```
 
 sudo apt-get install vagrant
 ```
 

-Other Linux distributions should have similar installation instructions using `yum` or similar.
+Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar.

 
 

-Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads) for more information.
+Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information.
+
+We currently support three Vagrant providers, namely `virtualbox`, `lxc` and `libvirt`. You might need to install one of these, for example virtualbox, and specify the provider, e.g. `--provider virtualbox`, when setting up your environment.

 
 # Setting up openstreetmap-website
 
 
 # Setting up openstreetmap-website
 


@@ -30,7 +32,7 @@ Within this login shell, you can do development, run the server or the tests. Fo
 
 ```
 cd /srv/openstreetmap-website/
 
 ```
 cd /srv/openstreetmap-website/

-rake test
+bundle exec rails test:all

 ```
 
 To access the web pages you run the following commands then access the site in your [local browser](http://localhost:3000):
 ```
 
 To access the web pages you run the following commands then access the site in your [local browser](http://localhost:3000):


@@ -38,7 +40,7 @@ To access the web pages you run the following commands then access the site in y
 ```
 vagrant ssh
 cd /srv/openstreetmap-website/
 ```
 vagrant ssh
 cd /srv/openstreetmap-website/

-rails server
+bundle exec rails server --binding=0.0.0.0

 ```
 
 You edit the code on your computer using the code editor you are used to using, then through shared folders the code is updated on the VM instantly.
 ```
 
 You edit the code on your computer using the code editor you are used to using, then through shared folders the code is updated on the VM instantly.