From fab367893d435a9ef905fe355d918e660359f064 Mon Sep 17 00:00:00 2001
From: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Date: Fri, 15 Dec 2023 12:11:26 +0100
Subject: [PATCH] Fixed meshdir for CERNBox to support invitations and removed
 duplicates

---
 examples/cernbox/cernbox.toml                |  2 +-
 examples/cernbox/custom-mime-types-demo.json |  3 ---
 examples/cernbox/providers.testnet.json      | 26 --------------------
 examples/sciencemesh/providers.testnet.json  | 22 +++++++++++------
 tests/sciencemesh/scripts/reva-run.sh        | 12 ++++-----
 5 files changed, 22 insertions(+), 43 deletions(-)
 delete mode 100644 examples/cernbox/custom-mime-types-demo.json
 delete mode 100644 examples/cernbox/providers.testnet.json

diff --git a/examples/cernbox/cernbox.toml b/examples/cernbox/cernbox.toml
index 7c010677e9..6e28d09e6c 100644
--- a/examples/cernbox/cernbox.toml
+++ b/examples/cernbox/cernbox.toml
@@ -267,7 +267,7 @@ driver = "ocmreceived"
 [http.services.sciencemesh]
 address = ":443"
 provider_domain = "{{ vars.provider_domain }}"
-mesh_directory_url = "https://sciencemesh.cesnet.cz/iop/meshdir"
+mesh_directory_url = "https:/meshdir.docker/meshdir"
 ocm_mount_point = "/sciencemesh"
 
 [http.services.sciencemesh.smtp_credentials]
diff --git a/examples/cernbox/custom-mime-types-demo.json b/examples/cernbox/custom-mime-types-demo.json
deleted file mode 100644
index 390947ec09..0000000000
--- a/examples/cernbox/custom-mime-types-demo.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  ".zmd": "application/compressed-markdown"
-}
diff --git a/examples/cernbox/providers.testnet.json b/examples/cernbox/providers.testnet.json
deleted file mode 100644
index 427045a5f6..0000000000
--- a/examples/cernbox/providers.testnet.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {	"domain": "revad1.docker",	"services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revad1.docker/ocm/" }, "host": "revad1.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://revad1.docker/remote.php/webdav/" }, "host": "revad1.docker" }
-  ] },
-  { "domain": "revad2.docker", "services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revad2.docker/ocm/" }, "host": "revad2.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://revad2.docker/remote.php/webdav/" }, "host": "revad2.docker" }
-  ] },
-  {	"domain": "revanextcloud1.docker",	"services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revanextcloud1.docker/ocm/" }, "host": "revanextcloud1.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc1.docker/remote.php/webdav/" }, "host": "nc1.docker" }
-  ] },
-  { "domain": "revanextcloud2.docker", "services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revanextcloud2.docker/ocm/" }, "host": "revanextcloud2.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc2.docker/remote.php/webdav/" }, "host": "nc2.docker" }
-  ] },
-  {	"domain": "revaowncloud1.docker",	"services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revaowncloud1.docker/ocm/" }, "host": "revaowncloud1.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://oc1.docker/remote.php/webdav/" }, "host": "oc1.docker" }
-  ] },
-  { "domain": "revaowncloud2.docker", "services": [
-    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revaowncloud2.docker/ocm/" }, "host": "revaowncloud2.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://oc2.docker/remote.php/webdav/" }, "host": "oc2.docker" }
-  ] }
-]
diff --git a/examples/sciencemesh/providers.testnet.json b/examples/sciencemesh/providers.testnet.json
index 427045a5f6..1960fdd63c 100644
--- a/examples/sciencemesh/providers.testnet.json
+++ b/examples/sciencemesh/providers.testnet.json
@@ -1,5 +1,5 @@
 [
-  {	"domain": "revad1.docker",	"services": [
+  {	"domain": "revad1.docker", "services": [
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revad1.docker/ocm/" }, "host": "revad1.docker" },
     { "endpoint": { "type": { "name": "Webdav" }, "path": "https://revad1.docker/remote.php/webdav/" }, "host": "revad1.docker" }
   ] },
@@ -7,20 +7,28 @@
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revad2.docker/ocm/" }, "host": "revad2.docker" },
     { "endpoint": { "type": { "name": "Webdav" }, "path": "https://revad2.docker/remote.php/webdav/" }, "host": "revad2.docker" }
   ] },
-  {	"domain": "revanextcloud1.docker",	"services": [
+  {	"domain": "revanextcloud1.docker", "services": [
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revanextcloud1.docker/ocm/" }, "host": "revanextcloud1.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc1.docker/remote.php/webdav/" }, "host": "nc1.docker" }
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc1.docker/remote.php/webdav/" }, "host": "nextcloud1.docker" }
   ] },
   { "domain": "revanextcloud2.docker", "services": [
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revanextcloud2.docker/ocm/" }, "host": "revanextcloud2.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc2.docker/remote.php/webdav/" }, "host": "nc2.docker" }
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://nc2.docker/remote.php/webdav/" }, "host": "nextcloud2.docker" }
   ] },
-  {	"domain": "revaowncloud1.docker",	"services": [
+  {	"domain": "revaowncloud1.docker", "services": [
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revaowncloud1.docker/ocm/" }, "host": "revaowncloud1.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://oc1.docker/remote.php/webdav/" }, "host": "oc1.docker" }
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://owncloud1.docker/remote.php/webdav/" }, "host": "owncloud1.docker" }
   ] },
   { "domain": "revaowncloud2.docker", "services": [
     { "endpoint": { "type": { "name": "OCM" }, "path": "https://revaowncloud2.docker/ocm/" }, "host": "revaowncloud2.docker" },
-    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://oc2.docker/remote.php/webdav/" }, "host": "oc2.docker" }
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://owncloud2.docker/remote.php/dav/" }, "host": "owncloud2.docker" }
+  ] },
+  {	"domain": "revacernbox1.docker", "services": [
+    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revacernbox1.docker/ocm/" }, "host": "revacernbox1.docker" },
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://cernbox1.docker/remote.php/dav/" }, "host": "cernbox1.docker" }
+  ] },
+  { "domain": "revacernbox2.docker", "services": [
+    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revacernbox2.docker/ocm/" }, "host": "revacernbox2.docker" },
+    { "endpoint": { "type": { "name": "Webdav" }, "path": "https://cernbox2.docker/remote.php/dav/" }, "host": "cernbox2.docker" }
   ] }
 ]
diff --git a/tests/sciencemesh/scripts/reva-run.sh b/tests/sciencemesh/scripts/reva-run.sh
index 240fe06879..0bac75c8ac 100755
--- a/tests/sciencemesh/scripts/reva-run.sh
+++ b/tests/sciencemesh/scripts/reva-run.sh
@@ -3,21 +3,21 @@
 # create new dir and copy relevant configs there.
 rm -rf /etc/revad
 mkdir -p /etc/revad
+cp /configs/revad/* /etc/revad/
 if [ "${HOST::-1}" == "revacernbox" ]; then
   cp /configs/cernbox/* /etc/revad/
-else
-  cp /configs/revad/* /etc/revad/
+  rm /etc/revad/sciencemesh*.toml
 fi
 
 # substitute placeholders and "external" values with valid ones for the testnet.
 sed -i "s/your.revad.ssl/${HOST}/g" /etc/revad/*.toml
 sed -i "s/your.revad.org/${HOST}.docker/" /etc/revad/*.toml
 sed -i "s/localhost/${HOST}.docker/" /etc/revad/*.toml
-sed -i "s/your.efss.org/${HOST//reva/}.docker/" /etc/revad/sciencemesh.toml
-sed -i "s/your.nginx.org/${HOST//reva/}.docker/" /etc/revad/cernbox.toml
+sed -i "s/your.efss.org/${HOST//reva/}.docker/" /etc/revad/*.toml
+sed -i "s/your.nginx.org/${HOST//reva/}.docker/" /etc/revad/*.toml
 sed -i "s/your.wopi.org/${HOST/reva/wopi/}.docker/" /etc/revad/*.toml
-sed -i "/^mesh_directory_url /s/=.*$/= 'https:\/\/meshdir\.docker\/meshdir'/" /etc/revad/sciencemesh.toml
-sed -i "/ocmproviderauthorizer\]/{n;s/.*/driver = \"json\"/;}" /etc/revad/sciencemesh.toml
+sed -i "/^mesh_directory_url /s/=.*$/= 'https:\/\/meshdir\.docker\/meshdir'/" /etc/revad/*.toml
+sed -i "/ocmproviderauthorizer\]/{n;s/.*/driver = \"json\"/;}" /etc/revad/*.toml
 sed -i "s/debug/trace/" /etc/revad/*.toml
 
 cp /etc/tls/*.crt /usr/local/share/ca-certificates/