From 7825f321394544d97a303873d8aae9c616ba8e64 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Sat, 2 Mar 2024 09:20:29 +0000 Subject: [PATCH 1/5] add: new reva (v1.28) configs --- docker/revad/custom-mime-types-demo.json | 3 + docker/revad/metrics.json | 5 + docker/revad/providers.testnet.json | 170 +++++------------------ docker/revad/sciencemesh-apps.toml | 49 +++++++ docker/revad/sciencemesh.toml | 156 +++++++++++++-------- 5 files changed, 187 insertions(+), 196 deletions(-) create mode 100644 docker/revad/custom-mime-types-demo.json create mode 100644 docker/revad/metrics.json create mode 100644 docker/revad/sciencemesh-apps.toml diff --git a/docker/revad/custom-mime-types-demo.json b/docker/revad/custom-mime-types-demo.json new file mode 100644 index 00000000..906c547c --- /dev/null +++ b/docker/revad/custom-mime-types-demo.json @@ -0,0 +1,3 @@ +{ + ".zmd": "application/compressed-markdown" +} diff --git a/docker/revad/metrics.json b/docker/revad/metrics.json new file mode 100644 index 00000000..a36a5cae --- /dev/null +++ b/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 +} diff --git a/docker/revad/providers.testnet.json b/docker/revad/providers.testnet.json index b4097d94..1960fdd6 100644 --- a/docker/revad/providers.testnet.json +++ b/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" } + ] } ] diff --git a/docker/revad/sciencemesh-apps.toml b/docker/revad/sciencemesh-apps.toml new file mode 100644 index 00000000..00bef3e8 --- /dev/null +++ b/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" diff --git a/docker/revad/sciencemesh.toml b/docker/revad/sciencemesh.toml index ad04d2f3..59857bff 100644 --- a/docker/revad/sciencemesh.toml +++ b/docker/revad/sciencemesh.toml @@ -1,16 +1,43 @@ +## Example configuration for the ScienceMesh app in ownCloud 10 / Nextcloud +# +## 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. If you have a Kubernetes deployment with an ingress and a route: +# 2.1. Set the `external_reva_endpoint` var to your actual externally-visible route to reva +# 3. Replace `your.efss.org` with the actual endpoint of your EFSS system +# 4. Define appropriate secrets in the [vars] section: the `efss_shared_secret` must match the `oc_appconfig.configvalue` in your EFSS DB for `oc_appconfig.app_id` = `sciencemesh` +# 5. Provide appropriate SSL full chain certificate and key files in the [http] section +# +# If you want to terminate the SSL connection to reva at your reverse proxy system +# (e.g. at your Kubernetes ingress), then you can configure reva to use http instead. +# For that, you need to follow these steps: +# +# 1. Remove the `certfile` and `keyfile` entries from the [http] section +# 2. Replace the https port `443` with a port number of your choice everywhere you find it +# 3. Look for `data_server_url` and replace the `https://localhost` address as indicated + + [vars] +internal_gateway = "your.revad.org" +provider_domain = "your.revad.org" +external_reva_endpoint = "https://your.revad.org" # append here any route if applicable +efss_sciencemesh_endpoint = "https://your.efss.org/index.php/apps/sciencemesh/" machine_api_key = "machine-api-key" -provider_domain = "your.revad.com" -shared_secret = "shared-secret-1" +efss_shared_secret = "shared-secret-1" + +[http] +certfile = "/etc/tls/your.revad.ssl.crt" +keyfile = "/etc/tls/your.revad.ssl.key" [log] -level = "trace" +level = "debug" [shared] -gatewaysvc = "your.revad.com:19000" +gatewaysvc = "{{ vars.internal_gateway }}:19000" [grpc.services.gateway] -address = "your.revad.com:19000" +address = ":19000" authregistrysvc = "{{ grpc.services.authregistry.address }}" appregistrysvc = "{{ grpc.services.appregistry.address }}" storageregistrysvc = "{{ grpc.services.storageregistry.address }}" @@ -33,12 +60,12 @@ driver = "static" [grpc.services.appregistry.drivers.static] mime_types = [ - { "mime_type" = "text/plain", "extension" = "txt", "name" = "Text file", "description" = "Text file", "allow_creation" = true }, - { "mime_type" = "text/markdown", "extension" = "md", "name" = "Markdown file", "description" = "Markdown file", "allow_creation" = true }, - { "mime_type" = "application/vnd.oasis.opendocument.text", "extension" = "odt", "name" = "OpenDocument", "description" = "OpenDocument text document", "default_app" = "Collabora", "allow_creation" = true }, - { "mime_type" = "application/vnd.oasis.opendocument.spreadsheet", "extension" = "ods", "name" = "OpenSpreadsheet", "description" = "OpenDocument spreadsheet document", "default_app" = "Collabora", "allow_creation" = true }, - { "mime_type" = "application/vnd.oasis.opendocument.presentation", "extension" = "odp", "name" = "OpenPresentation", "description" = "OpenDocument presentation document", "default_app" = "Collabora", "allow_creation" = true }, - { "mime_type" = "application/vnd.jupyter", "extension" = "ipynb", "name" = "Jupyter Notebook", "description" = "Jupyter Notebook" } + {"mime_type" = "text/plain", "extension" = "txt", "name" = "Text file", "description" = "Text file", "allow_creation" = true}, + {"mime_type" = "text/markdown", "extension" = "md", "name" = "Markdown file", "description" = "Markdown file", "allow_creation" = true}, + {"mime_type" = "application/vnd.oasis.opendocument.text", "extension" = "odt", "name" = "OpenDocument", "description" = "OpenDocument text document", "default_app" = "Collabora", "allow_creation" = true}, + {"mime_type" = "application/vnd.oasis.opendocument.spreadsheet", "extension" = "ods", "name" = "OpenSpreadsheet", "description" = "OpenDocument spreadsheet document", "default_app" = "Collabora", "allow_creation" = true}, + {"mime_type" = "application/vnd.oasis.opendocument.presentation", "extension" = "odp", "name" = "OpenPresentation", "description" = "OpenDocument presentation document", "default_app" = "Collabora", "allow_creation" = true}, + {"mime_type" = "application/vnd.jupyter", "extension" = "ipynb", "name" = "Jupyter Notebook", "description" = "Jupyter Notebook"} ] @@ -56,8 +83,8 @@ ocmshares = "{{ grpc.services.authprovider[2].address }}" auth_manager = "nextcloud" [grpc.services.authprovider.auth_managers.nextcloud] -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "{{ vars.shared_secret }}" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false [[grpc.services.authprovider]] @@ -65,7 +92,7 @@ auth_manager = "machine" [grpc.services.authprovider.auth_managers.machine] api_key = "{{ vars.machine_api_key }}" -gateway_addr = "your.revad.com:19000" +gateway_addr = "{{ vars.internal_gateway }}:19000" [[grpc.services.authprovider]] auth_manager = "ocmshares" @@ -80,21 +107,22 @@ driver = "static" home_provider = "/home" [grpc.services.storageregistry.drivers.static.rules] -"/home" = { "address" = "{{ grpc.services.storageprovider[0].address }}" } -"nextcloud" = { "address" = "{{ grpc.services.storageprovider[0].address }}" } -"/ocm" = { "address" = "{{ grpc.services.storageprovider[1].address }}" } -"ocm" = { "address" = "{{ grpc.services.storageprovider[1].address }}" } +"/home" = {"address" = "{{ grpc.services.storageprovider[0].address }}"} +"nextcloud" = {"address" = "{{ grpc.services.storageprovider[0].address }}"} +"/ocm" = {"address" = "{{ grpc.services.storageprovider[1].address }}"} +"ocm" = {"address" = "{{ grpc.services.storageprovider[1].address }}"} [[grpc.services.storageprovider]] driver = "nextcloud" mount_id = "nextcloud" expose_data_server = true enable_home_creation = false -data_server_url = "https://your.revad.com:{{ http.services.dataprovider[0].address.port }}/data" +# replace https://localhost with http://localhost if reva does not serve https traffic +data_server_url = "https://localhost:{{ http.services.dataprovider[0].address.port }}/data" [grpc.services.storageprovider.drivers.nextcloud] -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "{{ vars.shared_secret }}" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false [[grpc.services.storageprovider]] @@ -103,7 +131,7 @@ mount_id = "ocm" mount_path = "/ocm" expose_data_server = true enable_home_creation = false -data_server_url = "https://your.revad.com:{{ http.services.dataprovider[1].address.port }}/data" +data_server_url = "{{ vars.external_reva_endpoint }}/data" [grpc.services.storageprovider.drivers.ocmoutcoming] machine_secret = "{{ vars.machine_api_key }}" @@ -118,44 +146,51 @@ driver = "memory" driver = "nextcloud" [grpc.services.ocmcore.drivers.nextcloud] -host = "https://your.revad.com/" -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "{{ vars.shared_secret }}" +host = "{{ vars.external_reva_endpoint }}" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false [grpc.services.ocminvitemanager] -# TODO the driver should become "nextcloud" +# TODO the driver should be "nextcloud" once it is implemented driver = "json" -provider_domain = "your.revad.com" +provider_domain = "{{ vars.provider_domain }}" [grpc.services.ocmshareprovider] driver = "nextcloud" -provider_domain = "your.revad.com" -endpoint = "https://your.revad.com/" -webdav_endpoint = "https://your.revad.com/" -webdav_prefix = "https://your.revad.com/remote.php/dav/files" -webapp_template = "https://your.revad.com/external/sciencemesh/{{.Token}}/{relative-path-to-shared-resource}" +provider_domain = "{{ vars.provider_domain }}" +webdav_endpoint = "{{ vars.external_reva_endpoint }}" +webdav_prefix = "{{ vars.external_reva_endpoint }}/remote.php/dav/files" +webapp_template = "{{ vars.external_reva_endpoint }}/external/sciencemesh/{{.Token}}/{relative-path-to-shared-resource}" [grpc.services.ocmshareprovider.drivers.nextcloud] -webdav_host = "https://your.revad.com/" -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "{{ vars.shared_secret }}" +webdav_host = "{{ vars.external_reva_endpoint }}" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false mount_id = "nextcloud" [grpc.services.ocmproviderauthorizer] driver = "json" +[grpc.services.ocmproviderauthorizer.drivers.mentix] +url = "https://iop.sciencemesh.uni-muenster.de/iop/mentix/cs3" +verify_request_hostname = true +insecure = false +timeout = 10 +refresh = 900 + [grpc.services.ocmproviderauthorizer.drivers.json] -providers = "providers.testnet.json" +# this is used by the docker-based test deployment, not in production +providers = "/etc/revad/providers.testnet.json" verify_request_hostname = true [grpc.services.userprovider] driver = "nextcloud" [grpc.services.userprovider.drivers.nextcloud] -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "shared-secret-1" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false [grpc.services.datatx] @@ -184,34 +219,31 @@ file = "" ### HTTP ENDPOINTS ### -[http] -certfile = "/etc/revad/tls/your.revad.ssl.crt" -keyfile = "/etc/revad/tls/your.revad.ssl.key" - [http.services.appprovider] -address = "0.0.0.0:443" +address = ":443" insecure = true [http.services.datagateway] -address = "0.0.0.0:443" +address = ":443" [[http.services.dataprovider]] driver = "nextcloud" [http.services.dataprovider.drivers.nextcloud] -endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" -shared_secret = "shared-secret-1" +endpoint = "{{ vars.efss_sciencemesh_endpoint }}" +shared_secret = "{{ vars.efss_shared_secret }}" mock_http = false [[http.services.dataprovider]] +address = ":443" driver = "ocmoutcoming" [http.services.dataprovider.drivers.ocmoutcoming] machine_secret = "{{ vars.machine_api_key }}" [http.services.sciencemesh] -address = "0.0.0.0:443" -provider_domain = "your.revad.com" +address = ":443" +provider_domain = "{{ vars.provider_domain }}" mesh_directory_url = "https://meshdir.docker/meshdir" # for a production deployment, use: # mesh_directory_url = 'https://sciencemesh.cesnet.cz/iop/meshdir' @@ -219,33 +251,41 @@ ocm_mount_point = "/sciencemesh" [http.services.sciencemesh.smtp_credentials] disable_auth = true -sender_mail = "sciencemesh@your.revad.com" -smtp_server = "smtp.your.revad.com" +sender_mail = "sciencemesh@{{ vars.provider_domain }}" +smtp_server = "smtp.{{ vars.provider_domain }}" smtp_port = 25 [http.services.ocmprovider] -address = "0.0.0.0:443" +address = ":443" ocm_prefix = "ocm" provider = "Reva for ownCloud/Nextcloud" -endpoint = "https://your.revad.com" +endpoint = "{{ vars.external_reva_endpoint }}" enable_webapp = true enable_datatx = true -[http.services.ocmd] -address = "0.0.0.0:443" +[http.services.ocm] +address = ":443" prefix = "ocm" -[http.services.ocmd.config] -host = "your.revad.com" +[http.services.ocm.config] +host = "{{ vars.provider_domain }}" [http.services.ocs] -address = "0.0.0.0:443" +address = ":443" prefix = "ocs" [http.services.ocdav] -address = "0.0.0.0:443" +address = ":443" [http.services.prometheus] +address = ":443" + +[http.services.metrics] +address = ":443" +metrics_data_driver_type = "json" +metrics_data_location = "/etc/revad/metrics.json" +metrics_record_interval = 5000 + [http.services.sysinfo] [http.middlewares.cors] From ff197a84bfada01dfa2c99a1393156e2b49c4ca3 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Sat, 2 Mar 2024 09:20:59 +0000 Subject: [PATCH 2/5] modify: reva run script for new configs --- docker/scripts/reva-run.sh | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/docker/scripts/reva-run.sh b/docker/scripts/reva-run.sh index 8cde55c4..c73ef6bc 100755 --- a/docker/scripts/reva-run.sh +++ b/docker/scripts/reva-run.sh @@ -1,20 +1,30 @@ #!/usr/bin/env bash -# @michielbdejong halt on error in docker init scripts +# @michielbdejong halt on error in docker init scripts. set -e -# create new dir and copy configs there. -mkdir -p /revad/configs -cp /etc/revad/sciencemesh*.toml /revad/configs/ -cp /etc/revad/providers.testnet.json /revad/configs/providers.testnet.json +# 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/ + rm /etc/revad/sciencemesh*.toml +fi -# substitute placeholders with correct names. -sed -i "s/your.revad.ssl/${HOST}/g" /revad/configs/sciencemesh*.toml -sed -i "s/your.revad.com/${HOST}.docker/g" /revad/configs/sciencemesh*.toml -sed -i "s/your.efss.com/${HOST//reva/}.docker/g" /revad/configs/sciencemesh*.toml +# 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/*.toml +sed -i "s/your.nginx.org/${HOST//reva/}.docker/" /etc/revad/*.toml +# sed: -e expression #1, char 22: unknown option to `s' +# sed -i "s/your.wopi.org/${HOST/reva/wopi/}.docker/" /etc/revad/*.toml +sed -i "s/debug/trace/" /etc/revad/*.toml -cp /etc/revad/tls/*.crt /usr/local/share/ca-certificates/ +# update OS certificate store. +cp /etc/tls/*.crt /usr/local/share/ca-certificates/ update-ca-certificates # run revad. -revad --dev-dir "/revad/configs" & +revad --dev-dir "/etc/revad" & From a35b5958b82021204c5c34580936129719f85072 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Sat, 2 Mar 2024 09:21:28 +0000 Subject: [PATCH 3/5] update: reva version --- init/sciencemesh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/sciencemesh.sh b/init/sciencemesh.sh index b55eb2bd..c56a75e0 100755 --- a/init/sciencemesh.sh +++ b/init/sciencemesh.sh @@ -29,7 +29,7 @@ REPO_OWNCLOUD_APP=https://github.com/sciencemesh/nc-sciencemesh BRANCH_OWNCLOUD_APP=owncloud REPO_REVA=https://github.com/cs3org/reva -BRANCH_REVA=v1.26.0 +BRANCH_REVA=v1.28.0 # Nextcloud source code. [ ! -d "nextcloud" ] && \ From 0827008f1df0152aa7fcdb7b302df7e09d15db39 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Sat, 2 Mar 2024 09:23:22 +0000 Subject: [PATCH 4/5] update: reva mounted directories --- ci/ocm-test-suite.sh | 4 ++-- dev/sciencemesh.sh | 4 ++-- tests/ocm-test-suite.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/ocm-test-suite.sh b/ci/ocm-test-suite.sh index aa22fd57..8f1d844f 100755 --- a/ci/ocm-test-suite.sh +++ b/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" \ diff --git a/dev/sciencemesh.sh b/dev/sciencemesh.sh index 689924c0..5c45d5bc 100755 --- a/dev/sciencemesh.sh +++ b/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" \ diff --git a/tests/ocm-test-suite.sh b/tests/ocm-test-suite.sh index e8bc7caa..3a4f6acf 100755 --- a/tests/ocm-test-suite.sh +++ b/tests/ocm-test-suite.sh @@ -108,8 +108,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" \ From 5b08ba4c115fc27a13cce8a48664830d24508843 Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Baghbani Pourvahid Date: Sat, 2 Mar 2024 09:25:00 +0000 Subject: [PATCH 5/5] update: reva version in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6dbe8637..3a46914a 100644 --- a/README.md +++ b/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