From 0dba45909fea1bf94a048f560e458938a139cf1a Mon Sep 17 00:00:00 2001 From: Rob Smith Date: Thu, 15 Sep 2016 21:19:27 -0700 Subject: [PATCH] Minor Contributing documentation updates. These are small things I had to change to have the vagrant environtment work correctly. --- CONTRIBUTING.md | 6 +++--- config/environments/development.rb | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fceb365b..02be9484 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ # Request for contributions -We are always looking for contributions to OSEM. Read this guide on how to do that. +We are always looking for contributions to OSEM. Read this guide on how to do that. In particular, this community seeks the following types of contributions: @@ -10,7 +10,7 @@ In particular, this community seeks the following types of contributions: ### Runing OSEM for development We are using [Vagrant](https://www.vagrantup.com/) to create our development environments. -1. Install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads). Both tools support Linux, MacOS and Windows. +1. Install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox 5.0.10](https://www.virtualbox.org/wiki/Download_Old_Builds_5_0). Both tools support Linux, MacOS and Windows. 2. Install [vagrant-exec](https://github.com/p0deje/vagrant-exec): @@ -33,7 +33,7 @@ We are using [Vagrant](https://www.vagrantup.com/) to create our development env 5. Start your OSEM rails app: ``` - vagrant exec rails server -b 0.0.0.0 + vagrant exec /vagrant/bin/rails server -b 0.0.0.0 ``` 6. Check out your OSEM rails app: diff --git a/config/environments/development.rb b/config/environments/development.rb index 61d9fd57..597c0c07 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,6 +1,9 @@ Osem::Application.configure do # Settings specified here will take precedence over those in config/application.rb + # Allow the web console from the vagrant host ip + config.web_console.whitelisted_ips = '10.0.2.2' + # Use letter_opener_web for Vagrant (launchy won't work) config.action_mailer.delivery_method = ENV['USER'] == 'vagrant' ? :letter_opener_web : :letter_opener