fix merge and rebase dance

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

storage/pkg/command/frontend.go

@@ -201,7 +201,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
 					"resource_info_cache_ttl":   cfg.Reva.Frontend.OCSResourceInfoCacheTTL,
 					"prefix":                    cfg.Reva.Frontend.OCSPrefix,
 					"additional_info_attribute": cfg.Reva.Frontend.OCSAdditionalInfoAttribute,
-					"machine_auth_apikey":       "change-me-please", // FIXME make configurable
+					"machine_auth_apikey":       cfg.Reva.AuthMachineConfig.MachineAuthAPIKey,
 					"cache_warmup_driver":       cfg.Reva.Frontend.OCSCacheWarmupDriver,
 					"cache_warmup_drivers": map[string]interface{}{
 						"cbox": map[string]interface{}{

storage/pkg/command/gateway.go

@@ -180,8 +180,7 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
 					"driver": cfg.Reva.StorageRegistry.Driver,
 					"drivers": map[string]interface{}{
 						"spaces": map[string]interface{}{
-							"home_template": cfg.Reva.StorageRegistry.HomeProvider,
-							"providers":     spacesProviders(cfg, logger),
+							"providers": spacesProviders(cfg, logger),
 						},
 					},
 				},
@@ -234,14 +233,6 @@ func spacesProviders(cfg *config.Config, logger log.Logger) map[string]map[strin
 		},
 		cfg.Reva.StorageShares.Endpoint: {
 			"spaces": map[string]interface{}{
-				/*
-					"share": map[string]interface{}{
-						// The jail needs to be filled with mount points
-						// .Space.Name is a path relative to the mount point
-						"mount_point":   "/users/{{.CurrentUser.Id.OpaqueId}}/Shares",
-						"path_template": "/users/{{.CurrentUser.Id.OpaqueId}}/Shares/{{.Space.Name}}",
-					},
-				*/
 				"virtual": map[string]interface{}{
 					// The root of the share jail is mounted here
 					"mount_point": "/users/{{.CurrentUser.Id.OpaqueId}}/Shares",

storage/pkg/command/storageshares.go

@@ -117,7 +117,7 @@ func storageSharesConfigFromStruct(c *cli.Context, cfg *config.Config) map[strin
 	return rcfg
 }
 
-// StorageSharesSutureService allows for the storage-home command to be embedded and supervised by a suture supervisor tree.
+// StorageSharesSutureService allows for the storage-shares command to be embedded and supervised by a suture supervisor tree.
 type StorageSharesSutureService struct {
 	cfg *config.Config
 }