Skip to content

Commit ba6c332

Browse files
committed
Update Vagrantfile and docs/VAGRANT.md for new box
1 parent 15cad17 commit ba6c332

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

Vagrantfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
44
#
55
Vagrant.configure("2") do |config|
6-
config.vm.box = 'discourse-0.8.4'
7-
config.vm.box_url = 'http://www.discourse.org/vms/discourse-0.8.4.box'
6+
config.vm.box = 'discourse-0.9.7'
7+
config.vm.box_url = 'http://www.discourse.org/vms/discourse-0.9.7.box'
88

99
# Make this VM reachable on the host network as well, so that other
1010
# VM's running other browsers can access our dev server.

docs/VAGRANT.md

+9-11
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ Vagrant will prompt you for your admin password. This is so it can mount your lo
2727

2828
(The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)
2929

30-
If you would like to download a smaller VM (574MB instead of 935MB), or if you are having **trouble** downloading the VM:
31-
- Download this file: http://www.discourse.org/vms/discourse-0.8.4.box.7z using your favorite web browser/download tool.
32-
- 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
33-
- Extract it using 7z: `7z e discourse-0.8.4.box.7z`
34-
- Add it to vagrant: `vagrant box add discourse-0.8.4 /path/to/the/downloaded/discourse-0.8.4.box`.
35-
3630
**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`
3731

3832
**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
8680
cd /vagrant
8781
bundle install
8882
bundle exec rake db:migrate
89-
bundle exec rake db:seed_fu
9083
```
9184

9285
### Starting Rails
@@ -143,15 +136,20 @@ bundle exec sidekiq
143136

144137
Mailcatcher is used to avoid the whole issue of actually sending emails: https://github.com/sj26/mailcatcher
145138

146-
To start mailcatcher, run the following command in the vagrant image:
139+
Mailcatcher is already installed in the vm, and there's an alias to launch it:
147140

148141
```
149-
gem install mailcatcher && mailcatcher --http-ip 0.0.0.0
142+
mc
150143
```
151144

152-
Then in a browser, go to [http://localhost:4080](http://localhost:4080)
145+
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.
146+
147+
If for some reason mailcatcher is not installed, install and launch it with these commands:
153148

154-
Sent emails will be received by mailcatcher and shown in its web ui.
149+
```
150+
gem install mailcatcher
151+
mailcatcher --http-ip 0.0.0.0
152+
```
155153

156154
### Shutting down the VM
157155

0 commit comments

Comments
 (0)