From 04162aaa790b323261fa7f0716698ddde1b0daec Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Tue, 13 Jan 2015 16:14:00 -0700
Subject: [PATCH] Added flag to specify config file location

---
 main.go          | 11 ++++++++++-
 server/server.go |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 88fdaa91f..e81a9cd0d 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"sync"
 
@@ -11,7 +12,9 @@ import (
 func main() {
 	var wg sync.WaitGroup
 
-	vhosts, err := config.Load("Caddyfile")
+	flag.Parse()
+
+	vhosts, err := config.Load(conf)
 	if err != nil {
 		if config.IsNotFound(err) {
 			vhosts = config.Default()
@@ -37,3 +40,9 @@ func main() {
 
 	wg.Wait()
 }
+
+func init() {
+	flag.StringVar(&conf, "conf", server.DefaultConfigFile, "the configuration file to use")
+}
+
+var conf string
diff --git a/server/server.go b/server/server.go
index 258f943a7..ed98e87c3 100644
--- a/server/server.go
+++ b/server/server.go
@@ -174,3 +174,5 @@ func enableLogging(l config.Log) (*log.Logger, error) {
 
 	return log.New(file, "", 0), nil
 }
+
+const DefaultConfigFile = "Caddyfile"