From ba6c3324dce335df2a5910de5cd1e190e7f40b38 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 16 Oct 2013 13:55:26 -0400 Subject: [PATCH] Update Vagrantfile and docs/VAGRANT.md for new box --- Vagrantfile | 4 ++-- docs/VAGRANT.md | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index d956d3a2a8b..228eb225878 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,8 +3,8 @@ # See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md # Vagrant.configure("2") do |config| - config.vm.box = 'discourse-0.8.4' - config.vm.box_url = 'http://www.discourse.org/vms/discourse-0.8.4.box' + config.vm.box = 'discourse-0.9.7' + config.vm.box_url = 'http://www.discourse.org/vms/discourse-0.9.7.box' # Make this VM reachable on the host network as well, so that other # VM's running other browsers can access our dev server. diff --git a/docs/VAGRANT.md b/docs/VAGRANT.md index 1f198665adb..02969f1d1e5 100644 --- a/docs/VAGRANT.md +++ b/docs/VAGRANT.md @@ -27,12 +27,6 @@ Vagrant will prompt you for your admin password. This is so it can mount your lo (The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.) -If you would like to download a smaller VM (574MB instead of 935MB), or if you are having **trouble** downloading the VM: -- Download this file: http://www.discourse.org/vms/discourse-0.8.4.box.7z using your favorite web browser/download tool. -- If you don't have 7z available, you can still get the larger image from http://www.discourse.org/vms/discourse-0.8.4.box -- Extract it using 7z: `7z e discourse-0.8.4.box.7z` -- Add it to vagrant: `vagrant box add discourse-0.8.4 /path/to/the/downloaded/discourse-0.8.4.box`. - **Note to Linux users**: Your Discourse directory cannot be on an ecryptfs mount or you will receive an error: `exportfs: /home/your/path/to/discourse does not support NFS export` **Note to OSX/Linux users**: Vagrant will mount your local files via an NFS share. Therefore, make sure that NFS is installed or else you'll receive the error message: @@ -86,7 +80,6 @@ Now you're in a virtual machine is almost ready to start developing. It's a good cd /vagrant bundle install bundle exec rake db:migrate -bundle exec rake db:seed_fu ``` ### Starting Rails @@ -143,15 +136,20 @@ bundle exec sidekiq Mailcatcher is used to avoid the whole issue of actually sending emails: https://github.com/sj26/mailcatcher -To start mailcatcher, run the following command in the vagrant image: +Mailcatcher is already installed in the vm, and there's an alias to launch it: ``` -gem install mailcatcher && mailcatcher --http-ip 0.0.0.0 +mc ``` -Then in a browser, go to [http://localhost:4080](http://localhost:4080) +Then in a browser, go to [http://localhost:4080](http://localhost:4080). Sent emails will be received by mailcatcher and shown in its web ui. -Sent emails will be received by mailcatcher and shown in its web ui. +If for some reason mailcatcher is not installed, install and launch it with these commands: + +``` +gem install mailcatcher +mailcatcher --http-ip 0.0.0.0 +``` ### Shutting down the VM