fix merge and rebase dance

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2022-01-07 19:58:42 +00:00
parent d08c805179
commit 191b3de60a
5 changed files with 7 additions and 455 deletions
@@ -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{}{