diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-05 12:12:37 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-05 12:17:35 +0200 |
| commit | 1ab09e4f1b27789121dfba9a6c6e4aa0011ab215 (patch) | |
| tree | 59ec5e54ed44c41915217522ea37bebf24bd5797 /cmd | |
| parent | 02c5bade0fabc24b9b7c05a74c65965e2e53f687 (diff) | |
| download | gitea-1ab09e4f1b27789121dfba9a6c6e4aa0011ab215.tar.gz gitea-1ab09e4f1b27789121dfba9a6c6e4aa0011ab215.zip | |
Add option to provide configuration file on command line
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dump.go | 4 | ||||
| -rw-r--r-- | cmd/serve.go | 7 | ||||
| -rw-r--r-- | cmd/update.go | 8 | ||||
| -rw-r--r-- | cmd/web.go | 4 |
4 files changed, 21 insertions, 2 deletions
diff --git a/cmd/dump.go b/cmd/dump.go index 3e1ccdb8a3..57f1113ea3 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -26,10 +26,14 @@ It can be used for backup and capture Gogs server image to send to maintainer`, Action: runDump, Flags: []cli.Flag{ cli.BoolFlag{"verbose, v", "show process details", ""}, + cli.StringFlag{"config, c", "custom/conf/app.ini", "Configuration file", ""}, }, } func runDump(ctx *cli.Context) { + if ctx.IsSet("config") { + setting.CustomConf = ctx.String("config") + } setting.NewConfigContext() models.LoadModelsConfig() models.SetEngine() diff --git a/cmd/serve.go b/cmd/serve.go index 2390962342..7b593f40ad 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -27,7 +27,9 @@ var CmdServ = cli.Command{ Usage: "This command should only be called by SSH shell", Description: `Serv provide access auth for repositories`, Action: runServ, - Flags: []cli.Flag{}, + Flags: []cli.Flag{ + cli.StringFlag{"config, c", "custom/conf/app.ini", "Configuration file", ""}, + }, } func setup(logPath string) { @@ -77,6 +79,9 @@ func In(b string, sl map[string]models.AccessType) bool { } func runServ(k *cli.Context) { + if k.IsSet("config") { + setting.CustomConf = k.String("config") + } setup("serv.log") keys := strings.Split(os.Args[2], "-") diff --git a/cmd/update.go b/cmd/update.go index cc55693e2b..2ea7e942dd 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -11,6 +11,7 @@ import ( "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/setting" ) var CmdUpdate = cli.Command{ @@ -18,10 +19,15 @@ var CmdUpdate = cli.Command{ Usage: "This command should only be called by SSH shell", Description: `Update get pushed info and insert into database`, Action: runUpdate, - Flags: []cli.Flag{}, + Flags: []cli.Flag{ + cli.StringFlag{"config, c", "custom/conf/app.ini", "Configuration file", ""}, + }, } func runUpdate(c *cli.Context) { + if c.IsSet("config") { + setting.CustomConf = c.String("config") + } cmd := os.Getenv("SSH_ORIGINAL_COMMAND") if cmd == "" { return 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() |