Revert "Updated examples"

This reverts commit 6504e63.
cs3org · May 11, 2023 · 74523e3 · 74523e3
1 parent 8b5d251
commit 74523e3
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 18 deletions.
diff --git a/examples/meshdirectory/meshdirectory.toml b/examples/meshdirectory/meshdirectory.toml
@@ -24,7 +24,6 @@ file = "/var/tmp/reva/shares_server_1.json"
 [http.services.dataprovider]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 [http.services.ocdav]
 [http.services.ocs]
 

diff --git a/examples/nextcloud-integration/revad.toml b/examples/nextcloud-integration/revad.toml
@@ -112,7 +112,7 @@ driver = "nextcloud"
 endpoint = "http://localhost/apps/sciencemesh/"
 
 [http]
-enabled_services = ["ocmd", "ocmprovider"]
+enabled_services = ["ocmd"]
 enabled_middlewares = ["providerauthorizer", "cors"]
 address = "0.0.0.0:19001"
 
@@ -126,8 +126,7 @@ driver = "nextcloud"
 user_layout = "{{.Username}}"
 
 [http.services.ocmd]
-
-[http.services.ocmprovider]
+prefix = "ocm"
 provider = "Reva-Nextcloud"
 endpoint = "http://localhost"
 webdav_root = "/remote.php/dav/ocm"

diff --git a/examples/oc-phoenix/ocmd.toml b/examples/oc-phoenix/ocmd.toml
@@ -28,14 +28,12 @@ driver = "json"
 providers = "providers.demo.json"
 
 [http]
-enabled_services = ["ocmd", "ocmprovider"]
+enabled_services = ["ocmd"]
 enabled_middlewares = ["providerauthorizer", "cors"]
 address = "0.0.0.0:13001"
 
 [http.services.ocmd]
 prefix = "ocm"
-
-[http.services.ocmprovider]
 endpoint = "http://localhost:13001"
 
 [http.middlewares.providerauthorizer]

diff --git a/examples/ocmd/server-1/ocmd-server-1.toml b/examples/ocmd/server-1/ocmd-server-1.toml
@@ -122,9 +122,6 @@ user_layout = "{{.Username}}"
 
 [http.services.ocmd]
 prefix = "ocm"
-
-[http.services.ocmprovider]
-ocm_prefix = "ocm"
 provider = "reva@cern"
 endpoint = "http://localhost:19001"
 enable_webapp = true

diff --git a/examples/ocmd/server-2/ocmd-server-2.toml b/examples/ocmd/server-2/ocmd-server-2.toml
@@ -112,8 +112,7 @@ driver = "localhome"
 user_layout = "{{.Username}}"
 
 [http.services.ocmd]
-
-[http.services.ocmprovider]
+prefix = "ocm"
 provider = "reva@cesnet"
 endpoint = "http://localhost:17001"
 enable_webapp = true

diff --git a/examples/oidc-mapping-tpc/server-1.toml b/examples/oidc-mapping-tpc/server-1.toml
@@ -62,7 +62,6 @@ driver = "localhome"
 [http.services.datagateway]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 [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
@@ -62,7 +62,6 @@ driver = "localhome"
 [http.services.datagateway]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 [http.services.ocs]
 [http.services.ocdav]
 enable_http_tpc = true
diff --git a/examples/serverless/notifications.toml → ...les/serverless-example/notifications.toml b/examples/serverless/notifications.toml → ...les/serverless-example/notifications.toml
diff --git a/examples/standalone/standalone.toml b/examples/standalone/standalone.toml
@@ -17,6 +17,5 @@
 [http.services.dataprovider]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 [http.services.ocdav]
 [http.services.ocs]
diff --git a/examples/storage-references/gateway.toml b/examples/storage-references/gateway.toml
@@ -44,7 +44,6 @@ mime_types = [
 [http.services.datagateway]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 [http.services.ocdav]
 [http.services.ocs]
 [http.services.appprovider]
diff --git a/examples/two-server-setup/gateway-1.toml b/examples/two-server-setup/gateway-1.toml
@@ -54,7 +54,6 @@ address = "0.0.0.0:19001"
 [http.services.datagateway]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 provider = "Reva-Server-1"
 endpoint = "http://localhost:19001"
 enable_webapp = true

diff --git a/examples/two-server-setup/gateway-2.toml b/examples/two-server-setup/gateway-2.toml
@@ -69,7 +69,6 @@ address = "0.0.0.0:29001"
 [http.services.datagateway]
 [http.services.prometheus]
 [http.services.ocmd]
-[http.services.ocmprovider]
 provider = "Reva-Server-2"
 endpoint = "http://localhost:29001"
 enable_webapp = true