add new config options for the http client

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
owncloud · Jul 1, 2020 · 0a41496 · 0a41496
1 parent a6346a1
commit 0a41496
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/pkg/command/frontend.go b/pkg/command/frontend.go
@@ -121,12 +121,16 @@ func Frontend(cfg *config.Config) *cli.Command {
 						"services": map[string]interface{}{
 							"datagateway": map[string]interface{}{
 								"transfer_shared_secret": cfg.Reva.TransferSecret,
+								"timeout":                86400,
+								"insecure":               true,
 							},
 							"ocdav": map[string]interface{}{
 								"prefix":           "",
 								"chunk_folder":     "/var/tmp/reva/chunks",
 								"files_namespace":  cfg.Reva.OCDav.DavFilesNamespace,
 								"webdav_namespace": cfg.Reva.OCDav.WebdavNamespace,
+								"timeout":          86400,
+								"insecure":         true,
 								"disable_tus":      cfg.Reva.UploadDisableTus,
 							},
 							"ocs": map[string]interface{}{

diff --git a/pkg/command/storageeosdata.go b/pkg/command/storageeosdata.go
@@ -128,7 +128,9 @@ func StorageEOSData(cfg *config.Config) *cli.Command {
 										"user_layout":            cfg.Reva.Storages.EOS.Layout,
 									},
 								},
-								"temp_folder": cfg.Reva.StorageEOSData.TempFolder,
+								"timeout":     86400,
+								"insecure":    true,
+								"disable_tus": false,
 							},
 						},
 					},

diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go
@@ -146,7 +146,9 @@ func StorageHomeData(cfg *config.Config) *cli.Command {
 										"prefix":     cfg.Reva.Storages.S3.Prefix,
 									},
 								},
-								"temp_folder": cfg.Reva.StorageHomeData.TempFolder,
+								"timeout":     86400,
+								"insecure":    true,
+								"disable_tus": false,
 							},
 						},
 					},

diff --git a/pkg/command/storageocdata.go b/pkg/command/storageocdata.go
@@ -146,7 +146,9 @@ func StorageOCData(cfg *config.Config) *cli.Command {
 										"prefix":     cfg.Reva.Storages.S3.Prefix,
 									},
 								},
-								"temp_folder": cfg.Reva.StorageOCData.TempFolder,
+								"timeout":     86400,
+								"insecure":    true,
+								"disable_tus": false,
 							},
 						},
 					},

diff --git a/pkg/flagset/gateway.go b/pkg/flagset/gateway.go
@@ -90,8 +90,8 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.IntFlag{
 			Name:        "transfer-expires",
-			Value:       24 * 60 * 60,
-			Usage:       "Transfer secret for datagateway",
+			Value:       24 * 60 * 60, // one day
+			Usage:       "Transfer token ttl in seconds",
 			EnvVars:     []string{"REVA_TRANSFER_EXPIRES"},
 			Destination: &cfg.Reva.TransferExpires,
 		},