From d5d3d4ce175f3855b913dcfc7da680cbbcd68ee7 Mon Sep 17 00:00:00 2001
From: Mike Arpaia <mike@arpaia.co>
Date: Wed, 21 Sep 2016 05:22:53 -0700
Subject: [PATCH] Updating some docker compose functionality (#220)

close #210
---
 README.md          | 16 ++++++++++++----
 config/config.go   |  2 +-
 docker-compose.yml |  8 +++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ec6e0ceeef..6a47e3eb6c 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,9 @@ mail:
   address: localhost:1025
 ```
 
+`localhost:1025` is the default configuration. You can use `kolide config_dump`
+to see the values which Kolide is using given your configuration.
+
 #### Viewing email content in the terminal
 
 If you're [running Kolide in dev mode](#using-no-external-dependencies), emails
@@ -270,10 +273,15 @@ the Kolide binary as follows:
 kolide serve
 ```
 
-There is an example configuration file included in this repository to make this
-process easier for you. You may have to edit the example configuration file to
-use the output of `docker-machine ip` instead of `localhost` if you're using
-Docker via [Docker Toolbox](https://www.docker.com/products/docker-toolbox).
+By default, Kolide will try to connect to servers running on default ports on
+localhost.
+
+If you're using Docker via [Docker Toolbox](https://www.docker.com/products/docker-toolbox).
+you may have to modify the default values use the output of `docker-machine ip`
+instead of `localhost`.There is an example configuration file included in this
+repository to make this process easier for you.  Use the `--config` flag of the
+Kolide binary to specify the path to your config. See `kolide --help` for more
+options.
 
 #### Using no external dependencies
 
diff --git a/config/config.go b/config/config.go
index c0f02f172d..2213e588cd 100644
--- a/config/config.go
+++ b/config/config.go
@@ -109,7 +109,7 @@ func (man Manager) addConfigs() {
 	man.addConfigString("app.web_address", "0.0.0.0:8080")
 
 	// SMTP
-	man.addConfigString("smtp.server", "")
+	man.addConfigString("smtp.server", "0.0.0.0:1025")
 	man.addConfigString("smtp.username", "")
 	man.addConfigString("smtp.password", "")
 	man.addConfigInt("smtp.pool_connections", 4)
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f0447cc1c..35d14ddda3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,4 +6,10 @@ mysql:
     MYSQL_USER: kolide
     MYSQL_PASSWORD: kolide
   ports:
-    - "3306:3306"
\ No newline at end of file
+    - "3306:3306"
+
+mailhog:
+  image: mailhog/mailhog:latest
+  ports:
+    - "8025:8025"
+    - "1025:1025"
\ No newline at end of file