Merge branch 'master' into ocis-1132

This commit is contained in:
A.Unger
2020-12-03 16:42:45 +01:00
17 changed files with 58 additions and 33 deletions
+1
View File
@@ -138,6 +138,7 @@ func Frontend(cfg *config.Config) *cli.Command {
"disable_tus": cfg.Reva.UploadDisableTus,
},
"ocs": map[string]interface{}{
"share_prefix": cfg.Reva.Frontend.OCSSharePrefix,
"prefix": cfg.Reva.Frontend.OCSPrefix,
"config": map[string]interface{}{
"version": "1.8",
+1
View File
@@ -82,6 +82,7 @@ type FrontendPort struct {
DatagatewayPrefix string
OCDavPrefix string
OCSPrefix string
OCSSharePrefix string
PublicURL string
Middleware Middleware
}
+7 -1
View File
@@ -100,7 +100,13 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
EnvVars: []string{"STORAGE_FRONTEND_OCS_PREFIX"},
Destination: &cfg.Reva.Frontend.OCSPrefix,
},
&cli.StringFlag{
Name: "ocs-share-prefix",
Value: "/Shares",
Usage: "the prefix prepended to the path of shared files",
EnvVars: []string{"STORAGE_FRONTEND_OCS_Share_PREFIX"},
Destination: &cfg.Reva.Frontend.OCSSharePrefix,
},
// Gateway
&cli.StringFlag{