use opencloudurl

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

services/ocm/pkg/config/defaults/defaultconfig.go

@@ -182,11 +182,11 @@ func EnsureDefaults(cfg *config.Config) {
 		cfg.GRPC.TLS = structs.CopyOrZeroValue(cfg.Commons.GRPCServiceTLS)
 	}
 
-	if (cfg.Commons != nil && cfg.Commons.OcisURL != "") &&
+	if (cfg.Commons != nil && cfg.Commons.OpenCloudURL != "") &&
 		(cfg.HTTP.CORS.AllowedOrigins == nil ||
 			len(cfg.HTTP.CORS.AllowedOrigins) == 1 &&
 				cfg.HTTP.CORS.AllowedOrigins[0] == "https://localhost:9200") {
-		cfg.HTTP.CORS.AllowedOrigins = []string{cfg.Commons.OcisURL}
+		cfg.HTTP.CORS.AllowedOrigins = []string{cfg.Commons.OpenCloudURL}
 	}
 }
 

services/ocm/pkg/revaconfig/config.go

@@ -13,7 +13,7 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
 
 	// Construct the ocm provider domain from the oCIS URL
 	providerDomain := ""
-	u, err := url.Parse(cfg.Commons.OcisURL)
+	u, err := url.Parse(cfg.Commons.OpenCloudURL)
 	switch {
 	case err != nil:
 		logger.Error().Err(err).Msg("could not parse oCIS URL")
@@ -60,7 +60,7 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
 					"prefix": ".well-known",
 					"ocmprovider": map[string]interface{}{
 						"ocm_prefix":    cfg.OCMD.Prefix,
-						"endpoint":      cfg.Commons.OcisURL,
+						"endpoint":      cfg.Commons.OpenCloudURL,
 						"provider":      "OpenCloud",
 						"webdav_root":   "/dav/ocm",
 						"webapp_root":   cfg.ScienceMesh.Prefix,
@@ -157,7 +157,7 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
 					},
 					"gatewaysvc":      cfg.Reva.Address,
 					"provider_domain": providerDomain,
-					"webdav_endpoint": cfg.Commons.OcisURL,
+					"webdav_endpoint": cfg.Commons.OpenCloudURL,
 					"webapp_template": cfg.OCMShareProvider.WebappTemplate,
 					"client_insecure": cfg.OCMShareProvider.Insecure,
 				},