Merge branch 'master' into spaces-registry

This commit is contained in:
Jörn Friedrich Dreyer
2022-01-04 19:30:00 +00:00
80 changed files with 6205 additions and 501 deletions
+6
View File
@@ -71,6 +71,7 @@ func Frontend(cfg *config.Config) *cli.Command {
"version": "1.0.0",
"apps_url": cfg.Reva.AppProvider.AppsURL,
"open_url": cfg.Reva.AppProvider.OpenURL,
"new_url": cfg.Reva.AppProvider.NewURL,
},
}
@@ -194,6 +195,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
"public_url": cfg.Reva.Frontend.PublicURL,
},
"ocs": map[string]interface{}{
"storage_registry_svc": cfg.Reva.Gateway.Endpoint,
"share_prefix": cfg.Reva.Frontend.OCSSharePrefix,
"home_namespace": cfg.Reva.Frontend.OCSHomeNamespace,
"resource_info_cache_ttl": cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
@@ -290,6 +292,10 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
"incoming": true,
},
},
"spaces": map[string]interface{}{
"version": "0.0.1",
"enabled": true,
},
},
"version": map[string]interface{}{
"edition": "reva",