mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

add ocis.yaml

Browse Source
This commit is contained in:
A.Unger
2021-11-04 10:53:40 +01:00
parent 3d46e27aae
commit 4194da4e88
6 changed files with 89 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ocis/pkg/command/root.go
View File

@@ -3,15 +3,12 @@ package command
import (
"os"
gofig "github.com/gookit/config/v2"
gooyaml "github.com/gookit/config/v2/yaml"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/urfave/cli/v2"
"github.com/owncloud/ocis/ocis-pkg/config"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/urfave/cli/v2"
)
// Execute is the entry point for the ocis command.
@@ -24,7 +21,7 @@ func Execute() error {
Usage: "ownCloud Infinite Scale Stack",
Compiled: version.Compiled(),
Before: func(c *cli.Context) error {
return ParseConfig(c, cfg)
return ParseConfig(cfg)
},
Authors: []*cli.Author{
{
@@ -66,16 +63,15 @@ func NewLogger(cfg *config.Config) log.Logger {
}
// ParseConfig loads ocis configuration from known paths.
func ParseConfig(c *cli.Context, cfg *config.Config) error {
cnf := gofig.NewWithOptions("ocis", gofig.ParseEnv)
cnf.AddDriver(gooyaml.Driver)
err := cnf.LoadFiles("/Users/aunger/code/owncloud/ocis/ocis/pkg/command/ocis_example_config.yaml")
func ParseConfig(cfg *config.Config) error {
conf, err := ociscfg.BindSourcesToStructs("ocis", cfg)
if err != nil {
return err
}
err = cnf.BindStruct("", cfg)
if err != nil {
conf.LoadOSEnv(config.GetEnv(), false)
if err = cfg.UnmapEnv(conf); err != nil {
return err
}