diff options
| author | 2022-05-30 13:41:24 +0100 | |
|---|---|---|
| committer | 2022-05-30 14:41:24 +0200 | |
| commit | 43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00 (patch) | |
| tree | f0d5967d0ce639b6bc82aaf607f62e228fdf4559 /cmd/gotosocial/action/admin | |
| parent | [chore] Mastodon api fixups (#617) (diff) | |
| download | gotosocial-43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00.tar.xz | |
[chore] Global server configuration overhaul (#575)
* move config flag names and usage to config package, rewrite config package to use global Configuration{} struct
Signed-off-by: kim <grufwub@gmail.com>
* improved code comment
Signed-off-by: kim <grufwub@gmail.com>
* linter
Signed-off-by: kim <grufwub@gmail.com>
* fix unmarshaling
Signed-off-by: kim <grufwub@gmail.com>
* remove kim's custom go compiler changes
Signed-off-by: kim <grufwub@gmail.com>
* generate setter and flag-name functions, implement these in codebase
Signed-off-by: kim <grufwub@gmail.com>
* update deps
Signed-off-by: kim <grufwub@gmail.com>
* small change
Signed-off-by: kim <grufwub@gmail.com>
* appease the linter...
Signed-off-by: kim <grufwub@gmail.com>
* move configuration into ConfigState structure, ensure reloading to/from viper settings to keep in sync
Signed-off-by: kim <grufwub@gmail.com>
* lint
Signed-off-by: kim <grufwub@gmail.com>
* update code comments
Signed-off-by: kim <grufwub@gmail.com>
* fix merge issue
Signed-off-by: kim <grufwub@gmail.com>
* fix merge issue
Signed-off-by: kim <grufwub@gmail.com>
* improved version string (removes time + go version)
Signed-off-by: kim <grufwub@gmail.com>
* fix version string build to pass test script + consolidate logic in func
Signed-off-by: kim <grufwub@gmail.com>
* add license text, update config.Defaults comment
Signed-off-by: kim <grufwub@gmail.com>
* add license text to generated config helpers file
Signed-off-by: kim <grufwub@gmail.com>
* defer unlock on config.Set___(), to ensure unlocked on panic
Signed-off-by: kim <grufwub@gmail.com>
* make it more obvious which cmd flags are being attached
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'cmd/gotosocial/action/admin')
| -rw-r--r-- | cmd/gotosocial/action/admin/account/account.go | 19 | ||||
| -rw-r--r-- | cmd/gotosocial/action/admin/trans/export.go | 3 | ||||
| -rw-r--r-- | cmd/gotosocial/action/admin/trans/import.go | 3 |
3 files changed, 11 insertions, 14 deletions
diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go index cdbe70c15..05f5a776b 100644 --- a/cmd/gotosocial/action/admin/account/account.go +++ b/cmd/gotosocial/action/admin/account/account.go @@ -24,7 +24,6 @@ import ( "fmt" "time" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" @@ -41,7 +40,7 @@ var Create action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -49,7 +48,7 @@ var Create action.GTSAction = func(ctx context.Context) error { return err } - email := viper.GetString(config.Keys.AdminAccountEmail) + email := config.GetAdminAccountEmail() if email == "" { return errors.New("no email set") } @@ -57,7 +56,7 @@ var Create action.GTSAction = func(ctx context.Context) error { return err } - password := viper.GetString(config.Keys.AdminAccountPassword) + password := config.GetAdminAccountPassword() if password == "" { return errors.New("no password set") } @@ -80,7 +79,7 @@ var Confirm action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -115,7 +114,7 @@ var Promote action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -147,7 +146,7 @@ var Demote action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -179,7 +178,7 @@ var Disable action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -217,7 +216,7 @@ var Password action.GTSAction = func(ctx context.Context) error { return fmt.Errorf("error creating dbservice: %s", err) } - username := viper.GetString(config.Keys.AdminAccountUsername) + username := config.GetAdminAccountUsername() if username == "" { return errors.New("no username set") } @@ -225,7 +224,7 @@ var Password action.GTSAction = func(ctx context.Context) error { return err } - password := viper.GetString(config.Keys.AdminAccountPassword) + password := config.GetAdminAccountPassword() if password == "" { return errors.New("no password set") } diff --git a/cmd/gotosocial/action/admin/trans/export.go b/cmd/gotosocial/action/admin/trans/export.go index a6eb3f73b..2b5f82ee8 100644 --- a/cmd/gotosocial/action/admin/trans/export.go +++ b/cmd/gotosocial/action/admin/trans/export.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db/bundb" @@ -39,7 +38,7 @@ var Export action.GTSAction = func(ctx context.Context) error { exporter := trans.NewExporter(dbConn) - path := viper.GetString(config.Keys.AdminTransPath) + path := config.GetAdminTransPath() if path == "" { return errors.New("no path set") } diff --git a/cmd/gotosocial/action/admin/trans/import.go b/cmd/gotosocial/action/admin/trans/import.go index df7d32b69..75f2d6a5e 100644 --- a/cmd/gotosocial/action/admin/trans/import.go +++ b/cmd/gotosocial/action/admin/trans/import.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/cmd/gotosocial/action" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db/bundb" @@ -39,7 +38,7 @@ var Import action.GTSAction = func(ctx context.Context) error { importer := trans.NewImporter(dbConn) - path := viper.GetString(config.Keys.AdminTransPath) + path := config.GetAdminTransPath() if path == "" { return errors.New("no path set") } |
