Update Reva to version 1.28

README.md

@@ -31,7 +31,7 @@ The scripts for ScienceMesh still exist here but are not guaranteed to work as e
 
 upstream: [Reva](https://github.com/cs3org/reva)
 
-branch: [v1.26.0](https://github.com/owncloud/core/releases/tag/v1.26.0)
+branch: [v1.28.0](https://github.com/owncloud/core/releases/tag/v1.28.0)
 
 ## Trashbin
 

ci/ocm-test-suite.sh

@@ -109,8 +109,8 @@ function createReva() {
   -e HOST="reva${platform}${number}"                                          \
   -p "${port}:80"                                                             \
   -v "${ENV_ROOT}/reva:/reva"                                                 \
-  -v "${ENV_ROOT}/docker/revad:/etc/revad"                                    \
-  -v "${ENV_ROOT}/docker/tls:/etc/revad/tls"                                  \
+  -v "${ENV_ROOT}/docker/tls:/etc/tls"                                        \
+  -v "${ENV_ROOT}/docker/revad:/configs/revad"                                \
   -v "${ENV_ROOT}/docker/scripts/reva-run.sh:/usr/bin/reva-run.sh"            \
   -v "${ENV_ROOT}/docker/scripts/reva-kill.sh:/usr/bin/reva-kill.sh"          \
   -v "${ENV_ROOT}/docker/scripts/reva-entrypoint.sh:/entrypoint.sh"           \

dev/sciencemesh.sh

@@ -114,8 +114,8 @@ function createReva() {
   -e HOST="reva${platform}${number}"                                          \
   -p "${port}:80"                                                             \
   -v "${ENV_ROOT}/reva:/reva"                                                 \
-  -v "${ENV_ROOT}/docker/revad:/etc/revad"                                    \
-  -v "${ENV_ROOT}/docker/tls:/etc/revad/tls"                                  \
+  -v "${ENV_ROOT}/docker/tls:/etc/tls"                                        \
+  -v "${ENV_ROOT}/docker/revad:/configs/revad"                                \
   -v "${ENV_ROOT}/docker/scripts/reva-run.sh:/usr/bin/reva-run.sh"            \
   -v "${ENV_ROOT}/docker/scripts/reva-kill.sh:/usr/bin/reva-kill.sh"          \
   -v "${ENV_ROOT}/docker/scripts/reva-entrypoint.sh:/entrypoint.sh"           \

docker/revad/custom-mime-types-demo.json

@@ -0,0 +1,3 @@
+{
+    ".zmd": "application/compressed-markdown"
+}

docker/revad/metrics.json

@@ -0,0 +1,5 @@
+{
+    "cs3_org_sciencemesh_site_total_num_users": 0,
+    "cs3_org_sciencemesh_site_total_num_groups": 0,
+    "cs3_org_sciencemesh_site_total_amount_storage": 0
+}

docker/revad/providers.testnet.json

@@ -1,140 +1,34 @@
 [
-  {
-    "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"
-      }
-    ]
-  }
+  {	"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": "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": "nextcloud2.docker" }
+  ] },
+  {	"domain": "revaowncloud1.docker", "services": [
+    { "endpoint": { "type": { "name": "OCM" }, "path": "https://revaowncloud1.docker/ocm/" }, "host": "revaowncloud1.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://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" }
+  ] }
 ]

docker/revad/sciencemesh-apps.toml

@@ -0,0 +1,49 @@
+## Example configuration for the ScienceMesh app in ownCloud 10 / Nextcloud - Apps support
+#
+## This configuration file is to be used to enable Apps support in ScienceMesh.
+## To contextualize this configuration for your deployment, please follow these steps:
+#
+# 1. In the [vars] section below, replace `your.revad.org` with your actual domain
+# 2. Populate `wopi_endpoint` with your wopiserver endpoint
+# 3. Define a shared secret, and match it with the secret defined in the wopiserver
+
+
+[vars]
+internal_gateway = "your.revad.org"
+provider_domain = "your.revad.org"
+wopi_endpoint = "http://your.wopi.org:8880"
+wopi_shared_secret = "shared-secret-2"
+
+[log]
+level = "debug"
+
+[shared]
+gatewaysvc = "{{ vars.provider_domain }}:19000"
+
+[[grpc.services.appprovider]]
+driver = "wopi"
+custom_mime_types_json = "/etc/revad/custom-mime-types-demo.json"
+mime_types = ["application/vnd.oasis.opendocument.text", "application/vnd.oasis.opendocument.spreadsheet", "application/vnd.oasis.opendocument.presentation", "text/rtf"]
+app_provider_url = "{{ grpc.services.appprovider[0].address }}"
+language = "en-GB"
+
+[grpc.services.appprovider.drivers.wopi]
+iop_secret = "{{ vars.wopi_shared_secret }}"
+wopi_url = "{{ vars.wopi_endpoint }}"
+app_name = "Collabora"
+app_url = "http://collabora.docker:9980"
+app_int_url = "http://collabora.docker:9980"
+
+
+# [[grpc.services.appprovider]]
+# driver = "wopi"
+# custom_mime_types_json = "/etc/revad/custom-mime-types-demo.json"
+# mime_types = ["text/markdown", "application/compressed-markdown", "text/plain"]
+# app_provider_url = "{{ grpc.services.appprovider[1].address }}"
+#
+# [grpc.services.appprovider.drivers.wopi]
+# iop_secret = "{{ vars.wopi_shared_secret }}"
+# wopi_url = "{{ vars.wopi_endpoint }}"
+# app_name = "CodiMD"
+# app_url = "https://codimd.docker"
+# app_int_url = "https://codimd.docker"