Fixed meshdir for CERNBox to support invitations and removed duplicates

cs3org · Dec 15, 2023 · 9ad55a0 · 9ad55a0
1 parent f410a89
commit 9ad55a0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 40 deletions.
diff --git 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
diff --git a/examples/cernbox/providers.testnet.json b/examples/cernbox/providers.testnet.json
diff --git a/examples/sciencemesh/providers.testnet.json b/examples/sciencemesh/providers.testnet.json
@@ -9,18 +9,26 @@
   ] },
   {	"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": [
     { "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
@@ -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/