Merge branch 'master' into spaces-registry

This commit is contained in:
Jörn Friedrich Dreyer
2021-12-15 16:33:52 +00:00
62 changed files with 2744 additions and 933 deletions
+6
View File
@@ -61,6 +61,7 @@ type AppProvider struct {
WopiDriver WopiDriver `ocisConfig:"wopi_driver"`
AppsURL string `ocisConfig:"apps_url"`
OpenURL string `ocisConfig:"open_url"`
NewURL string `ocisConfig:"new_url"`
}
type WopiDriver struct {
@@ -930,6 +931,7 @@ func DefaultConfig() *Config {
WopiDriver: WopiDriver{},
AppsURL: "/app/list",
OpenURL: "/app/open",
NewURL: "/app/new",
},
Configs: nil,
UploadMaxChunkSize: 1e+8,
@@ -1301,6 +1303,10 @@ func structMappings(cfg *Config) []shared.EnvBinding {
EnvVars: []string{"STORAGE_FRONTEND_APP_PROVIDER_OPEN_URL"},
Destination: &cfg.Reva.AppProvider.OpenURL,
},
{
EnvVars: []string{"STORAGE_FRONTEND_APP_PROVIDER_NEW_URL"},
Destination: &cfg.Reva.AppProvider.NewURL,
},
// gateway
{