Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
r8 committed Mar 25, 2015
2 parents 2e43566 + 32cc57d commit b4fb315
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ Vagrant LAMP

My default LAMP development stack configuration for Vagrant.

Requrements
-----------

* Virtualbox
* Vagrant >= 1.7.0
* vagrant-omnibus plugin

Installation:
-------------

Expand Down Expand Up @@ -35,7 +42,7 @@ Installed software:
* zsh
* git, subversion
* mc, vim, screen, tmux, curl
* [MailHog](https://github.com/mailhog/)
* [MailHog](http://github.com/mailhog/MailHog)
* [Composer](http://getcomposer.org/)
* Phing
* Wordpress utils:
Expand Down Expand Up @@ -105,7 +112,7 @@ happens to serve webgrind.

### MailHog

ll emails sent via local mail transport are intercepted by MailHog. So normally no email would be delivered outside of the virtual machine. Instead you can check messages using web frontend for MailHog, which is running on port 8025 and also available on every domain:
ll emails sent via local mail transport are intercepted by [MailHog](http://github.com/mailhog/MailHog). So normally no email would be delivered outside of the virtual machine. Instead you can check messages using web frontend for MailHog, which is running on port 8025 and also available on every domain:

http://local.dev:8025

Expand Down
4 changes: 3 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

Vagrant.require_version ">= 1.7.0"

Vagrant.configure("2") do |config|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
Expand Down Expand Up @@ -43,7 +45,7 @@ Vagrant.configure("2") do |config|
vb.customize ["modifyvm", :id, "--cpus", "1"]
end

# Enable provisioning with chef solo, specifying a cookbooks path, roles
# Enable provisioning with chef zero, specifying a cookbooks path, roles
# path, and data_bags path (all relative to this Vagrantfile), and adding
# some recipes and/or roles.
config.vm.provision :chef_zero do |chef|
Expand Down

0 comments on commit b4fb315

Please sign in to comment.