Merge pull request #905 from phsmit/conf_on_cli

Add option to provide configuration file on command line

1 files changed, 4 insertions, 0 deletions

diff --git a/cmd/web.go b/cmd/web.go
index 55b6bf08..ceb21344 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -55,6 +55,7 @@ and it takes care of all the other things for you`,
 	Action: runWeb,
 	Flags: []cli.Flag{
 		cli.StringFlag{"port, p", "3000", "Temporary port number to prevent conflict", ""},
+		cli.StringFlag{"config, c", "custom/conf/app.ini", "Configuration file", ""},
 	},
 }
 
@@ -165,6 +166,9 @@ func newMacaron() *macaron.Macaron {
 }
 
 func runWeb(ctx *cli.Context) {
+	if ctx.IsSet("config") {
+		setting.CustomConf = ctx.String("config")
+	}
 	routers.GlobalInit()
 	checkVersion()