From 36b9caf89735a49ef67751497a757796be2e3470 Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Fri, 8 Jun 2018 11:59:42 -0400 Subject: [PATCH 1/3] Add config path as an optionial flag Fix #3483 --- cmd/admin.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/admin.go b/cmd/admin.go index 6c79141eabad0..7a519395b9d09 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -73,6 +73,11 @@ var ( Value: "", Usage: "New password to set for user", }, + cli.StringFlag{ + Name: "config, c", + Value: "custom/conf/app.ini", + Usage: "Custom configuration file path", + }, }, } @@ -122,6 +127,10 @@ func runChangePassword(c *cli.Context) error { if err := argsSet(c, "username", "password"); err != nil { return err } + + if c.IsSet("config") { + setting.CustomConf = c.String("config") + } if err := initDB(); err != nil { return err From 1737350e53efa7abac02ed7a860b8114e3b37b1a Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Fri, 8 Jun 2018 12:02:27 -0400 Subject: [PATCH 2/3] Add documentation --- docs/content/doc/usage/command-line.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/doc/usage/command-line.md b/docs/content/doc/usage/command-line.md index 9c16d49049f8c..a7a10b4e47b3b 100644 --- a/docs/content/doc/usage/command-line.md +++ b/docs/content/doc/usage/command-line.md @@ -62,6 +62,7 @@ Admin operations: - Options: - `--username value`, `-u value`: Username. Required. - `--password value`, `-p value`: New password. Required. + - `--config path`: Gitea configuration file path. Optional. (default: custom/conf/app.ini). - Examples: - `gitea admin change-password --username myname --password asecurepassword` - `regenerate` From 00c508c767c62a5d583da6f315ad2a0b181861d5 Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Fri, 8 Jun 2018 12:05:09 -0400 Subject: [PATCH 3/3] strip tab from empty line --- cmd/admin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/admin.go b/cmd/admin.go index 7a519395b9d09..4fb0810c660dc 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -127,7 +127,7 @@ func runChangePassword(c *cli.Context) error { if err := argsSet(c, "username", "password"); err != nil { return err } - + if c.IsSet("config") { setting.CustomConf = c.String("config") }