sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add OCIS_URL env var

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2020-12-21 16:20:02 +00:00
parent 4c718eb91c
commit 7dbc1af76f
19 changed files with 46 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pkg/command/server.go
+11 -2
View File
@@ -33,12 +33,21 @@ func Server(cfg *config.Config) *cli.Command {
Flags: flagset.ServerWithConfig(cfg),
Before: func(c *cli.Context) error {
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
cfg.HTTP.Root = strings.TrimRight(cfg.HTTP.Root, "/")
}
cfg.Web.Config.Apps = c.StringSlice("web-config-app")
return ParseConfig(c, cfg)
if err := ParseConfig(c, cfg); err != nil {
return err
}
// build well known openid-configuration endpoint if it is not set
if cfg.Web.Config.OpenIDConnect.MetadataURL == "" {
cfg.Web.Config.OpenIDConnect.MetadataURL = strings.TrimRight(cfg.Web.Config.OpenIDConnect.Authority) + "/.well-known/openid-configuration"
}
return nil
},
Action: func(c *cli.Context) error {
logger := NewLogger(cfg)