From 90010f20230627c79e1c4ca6588d9c47a420f459 Mon Sep 17 00:00:00 2001 From: Giuseppe Lo Presti Date: Thu, 26 Oct 2023 17:40:11 +0200 Subject: [PATCH] Updated following service rename in upstream master --- examples/cernbox/cernbox.toml | 4 ++-- examples/oc-phoenix/{ocmd.toml => ocm.toml} | 4 ++-- examples/{ocmd => ocm}/providers.demo.json | 0 examples/{ocmd => ocm}/server-1.toml | 4 ++-- examples/{ocmd => ocm}/server-2.toml | 4 ++-- examples/{ocmd => ocm}/users.demo.json | 0 examples/oidc-mapping-tpc/server-1.toml | 2 +- examples/oidc-mapping-tpc/server-2.toml | 2 +- examples/sciencemesh/sciencemesh.toml | 4 ++-- examples/standalone/standalone.toml | 2 +- examples/storage-references/gateway.toml | 2 +- examples/two-server-setup/gateway-1.toml | 2 +- examples/two-server-setup/gateway-2.toml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename examples/oc-phoenix/{ocmd.toml => ocm.toml} (93%) rename examples/{ocmd => ocm}/providers.demo.json (100%) rename examples/{ocmd => ocm}/server-1.toml (98%) rename examples/{ocmd => ocm}/server-2.toml (98%) rename examples/{ocmd => ocm}/users.demo.json (100%) diff --git a/examples/cernbox/cernbox.toml b/examples/cernbox/cernbox.toml index a12af5bd8f4..4939ceeef72 100644 --- a/examples/cernbox/cernbox.toml +++ b/examples/cernbox/cernbox.toml @@ -277,11 +277,11 @@ endpoint = "{{ vars.external_reva_endpoint }}" enable_webapp = true enable_datatx = true -[http.services.ocmd] +[http.services.ocm] address = ":443" prefix = "ocm" -[http.services.ocmd.config] +[http.services.ocm.config] host = "{{ vars.provider_domain }}" # OCS diff --git a/examples/oc-phoenix/ocmd.toml b/examples/oc-phoenix/ocm.toml similarity index 93% rename from examples/oc-phoenix/ocmd.toml rename to examples/oc-phoenix/ocm.toml index bd53def4ae8..3f977321014 100644 --- a/examples/oc-phoenix/ocmd.toml +++ b/examples/oc-phoenix/ocm.toml @@ -28,11 +28,11 @@ driver = "json" providers = "providers.demo.json" [http] -enabled_services = ["ocmd", "ocmprovider"] +enabled_services = ["ocm", "ocmprovider"] enabled_middlewares = ["providerauthorizer", "cors"] address = "0.0.0.0:13001" -[http.services.ocmd] +[http.services.ocm] prefix = "ocm" [http.middlewares.providerauthorizer] diff --git a/examples/ocmd/providers.demo.json b/examples/ocm/providers.demo.json similarity index 100% rename from examples/ocmd/providers.demo.json rename to examples/ocm/providers.demo.json diff --git a/examples/ocmd/server-1.toml b/examples/ocm/server-1.toml similarity index 98% rename from examples/ocmd/server-1.toml rename to examples/ocm/server-1.toml index 9785f943ddd..a4cb3994272 100644 --- a/examples/ocmd/server-1.toml +++ b/examples/ocm/server-1.toml @@ -162,14 +162,14 @@ machine_secret = "{{ vars.machine_api_key }}" [[http.services.dataprovider]] driver = "ocmreceived" -[http.services.ocmd] +[http.services.ocm] address = "0.0.0.0:8080" expose_recipient_display_name = true [http.services.ocmprovider] ocm_prefix = "ocm" provider = "reva@cern" -endpoint = "http://localhost:{{ http.services.ocmd.address.port }}" +endpoint = "http://localhost:{{ http.services.ocm.address.port }}" enable_webapp = true enable_datatx = true diff --git a/examples/ocmd/server-2.toml b/examples/ocm/server-2.toml similarity index 98% rename from examples/ocmd/server-2.toml rename to examples/ocm/server-2.toml index d4d154a9acc..7b9bf24cb32 100644 --- a/examples/ocmd/server-2.toml +++ b/examples/ocm/server-2.toml @@ -162,14 +162,14 @@ machine_secret = "{{ vars.machine_api_key }}" [[http.services.dataprovider]] driver = "ocmreceived" -[http.services.ocmd] +[http.services.ocm] address = "0.0.0.0:80" expose_recipient_display_name = true [http.services.ocmprovider] ocm_prefix = "ocm" provider = "reva@cesnet" -endpoint = "http://localhost:{{ http.services.ocmd.address.port }}" +endpoint = "http://localhost:{{ http.services.ocm.address.port }}" enable_webapp = true enable_datatx = true diff --git a/examples/ocmd/users.demo.json b/examples/ocm/users.demo.json similarity index 100% rename from examples/ocmd/users.demo.json rename to examples/ocm/users.demo.json diff --git a/examples/oidc-mapping-tpc/server-1.toml b/examples/oidc-mapping-tpc/server-1.toml index 2f62e51787d..223a646caf0 100644 --- a/examples/oidc-mapping-tpc/server-1.toml +++ b/examples/oidc-mapping-tpc/server-1.toml @@ -61,7 +61,7 @@ driver = "localhome" [http.services.datagateway] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocs] [http.services.ocdav] enable_http_tpc = true diff --git a/examples/oidc-mapping-tpc/server-2.toml b/examples/oidc-mapping-tpc/server-2.toml index 3616399a7e9..8424de5f183 100644 --- a/examples/oidc-mapping-tpc/server-2.toml +++ b/examples/oidc-mapping-tpc/server-2.toml @@ -61,7 +61,7 @@ driver = "localhome" [http.services.datagateway] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocs] [http.services.ocdav] enable_http_tpc = true diff --git a/examples/sciencemesh/sciencemesh.toml b/examples/sciencemesh/sciencemesh.toml index 3f9b3a26199..42ec42231fe 100644 --- a/examples/sciencemesh/sciencemesh.toml +++ b/examples/sciencemesh/sciencemesh.toml @@ -262,11 +262,11 @@ endpoint = "{{ vars.external_reva_endpoint }}" enable_webapp = true enable_datatx = true -[http.services.ocmd] +[http.services.ocm] address = ":443" prefix = "ocm" -[http.services.ocmd.config] +[http.services.ocm.config] host = "{{ vars.provider_domain }}" [http.services.ocs] diff --git a/examples/standalone/standalone.toml b/examples/standalone/standalone.toml index 0b54edd8419..5a63df304b8 100644 --- a/examples/standalone/standalone.toml +++ b/examples/standalone/standalone.toml @@ -16,7 +16,7 @@ [http.services.datagateway] [http.services.dataprovider] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocmprovider] [http.services.ocdav] [http.services.ocs] diff --git a/examples/storage-references/gateway.toml b/examples/storage-references/gateway.toml index 0cbed478ae4..c57d035e51e 100644 --- a/examples/storage-references/gateway.toml +++ b/examples/storage-references/gateway.toml @@ -56,7 +56,7 @@ app_url = "https://your-collabora-server.org:9980" [http.services.datagateway] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocmprovider] [http.services.ocdav] [http.services.ocs] diff --git a/examples/two-server-setup/gateway-1.toml b/examples/two-server-setup/gateway-1.toml index 5b79bd570d4..1d3414071c3 100644 --- a/examples/two-server-setup/gateway-1.toml +++ b/examples/two-server-setup/gateway-1.toml @@ -83,7 +83,7 @@ address = "0.0.0.0:19001" [http.services.datagateway] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocmprovider] provider = "Reva-Server-1" endpoint = "http://localhost:19001" diff --git a/examples/two-server-setup/gateway-2.toml b/examples/two-server-setup/gateway-2.toml index f8c410a7603..8361b3c7e8c 100644 --- a/examples/two-server-setup/gateway-2.toml +++ b/examples/two-server-setup/gateway-2.toml @@ -83,7 +83,7 @@ address = "0.0.0.0:29001" [http.services.datagateway] [http.services.prometheus] -[http.services.ocmd] +[http.services.ocm] [http.services.ocmprovider] provider = "Reva-Server-2" endpoint = "http://localhost:29001"