diff options
| author | 无闻 <u@gogs.io> | 2015-02-08 20:22:02 -0500 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-02-08 20:22:02 -0500 |
| commit | cd0ee35b3f887cc4ab6ba16cc2d955bfae607678 (patch) | |
| tree | bbe4ad9e924700d35833daf4f681a568dad278f5 /cmd/web.go | |
| parent | 3a44143b81aa050f53d5e0e2c87d4a84345cd94e (diff) | |
| parent | 1ab09e4f1b27789121dfba9a6c6e4aa0011ab215 (diff) | |
| download | gitea-cd0ee35b3f887cc4ab6ba16cc2d955bfae607678.tar.gz gitea-cd0ee35b3f887cc4ab6ba16cc2d955bfae607678.zip | |
Merge pull request #905 from phsmit/conf_on_cli
Add option to provide configuration file on command line
Diffstat (limited to 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/web.go b/cmd/web.go index 55b6bf0874..ceb2134447 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() |