diff --git a/examples/sciencemesh/sciencemesh-apps.toml b/examples/sciencemesh/sciencemesh-apps.toml index 4721bd4507..79d0b25a2b 100644 --- a/examples/sciencemesh/sciencemesh-apps.toml +++ b/examples/sciencemesh/sciencemesh-apps.toml @@ -2,7 +2,7 @@ level = "debug" [shared] -gatewaysvc = "your.revad.com:19000" +gatewaysvc = "your.revad.org:19000" [grpc] address = "0.0.0.0:19100" @@ -11,11 +11,11 @@ address = "0.0.0.0:19100" driver = "wopi" custom_mime_types_json = "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 = "your.revad.com:19100" +app_provider_url = "your.revad.org:19100" language = "en-GB" [grpc.services.appprovider.drivers.wopi] -iop_secret = "hello" +iop_secret = "wopi-iop-secret" wopi_url = "http://wopi.docker:8880/" app_name = "Collabora" app_url = "http://collabora.docker:9980" diff --git a/examples/sciencemesh/sciencemesh.toml b/examples/sciencemesh/sciencemesh.toml index 28b9ce9282..7da445a148 100644 --- a/examples/sciencemesh/sciencemesh.toml +++ b/examples/sciencemesh/sciencemesh.toml @@ -1,20 +1,25 @@ +## Example configuration for the ScienceMesh app in ownCloud 10 / Nextcloud +# +## To contextualize this configuration for your deployment: +# +# 1. Replace `your.revad.org` with your actual domain everywhere you find it +# 2. Replace `your.efss.org` in the [vars] section with your actual endpoint +# 3. Define appropriate secrets in the [vars] section + [vars] provider_domain = "your.revad.org" -efss_sciencemesh_endpoint = "https://your.efss.com/index.php/apps/sciencemesh/" +efss_sciencemesh_endpoint = "https://your.efss.org/index.php/apps/sciencemesh/" machine_api_key = "machine-api-key" -efss_shared_secret = "shared-secret-1" -mesh_directory_url = "https://meshdir.docker/meshdir" -# for a production deployment, use: -# mesh_directory_url = 'https://sciencemesh.cesnet.cz/iop/meshdir' +efss_shared_secret = "shared-secret" [log] -level = "trace" +level = "debug" [shared] -gatewaysvc = "{{ vars.provider_domain }}:19000" +gatewaysvc = "your.revad.org:19000" [grpc.services.gateway] -address = "{{ vars.provider_domain }}:19000" +address = "your.revad.org:19000" authregistrysvc = "{{ grpc.services.authregistry.address }}" appregistrysvc = "{{ grpc.services.appregistry.address }}" storageregistrysvc = "{{ grpc.services.storageregistry.address }}" @@ -94,7 +99,7 @@ driver = "nextcloud" mount_id = "nextcloud" expose_data_server = true enable_home_creation = false -data_server_url = "https://{{ vars.provider_domain }}:{{ http.services.dataprovider[0].address.port }}/data" +data_server_url = "https://your.revad.org:{{ http.services.dataprovider[0].address.port }}/data" [grpc.services.storageprovider.drivers.nextcloud] endpoint = "{{ vars.efss_sciencemesh_endpoint }}" @@ -107,7 +112,7 @@ mount_id = "ocm" mount_path = "/ocm" expose_data_server = true enable_home_creation = false -data_server_url = "https://{{ vars.provider_domain }}:{{ http.services.dataprovider[1].address.port }}/data" +data_server_url = "https://your.revad.org:{{ http.services.dataprovider[1].address.port }}/data" [grpc.services.storageprovider.drivers.ocmoutcoming] machine_secret = "{{ vars.machine_api_key }}" @@ -138,7 +143,7 @@ provider_domain = "{{ vars.provider_domain }}" endpoint = "https://{{ vars.provider_domain }}/" webdav_endpoint = "https://{{ vars.provider_domain }}/" webdav_prefix = "https://{{ vars.provider_domain }}/remote.php/dav/files" -webapp_template = "https://{{ vars.provider_domain }}/external/sciencemesh/{{.Token}}/{relative-path-to-shared-resource}" +webapp_template = "https://your.revad.org/external/sciencemesh/{{.Token}}/{relative-path-to-shared-resource}" [grpc.services.ocmshareprovider.drivers.nextcloud] webdav_host = "https://{{ vars.provider_domain }}/" @@ -216,7 +221,7 @@ machine_secret = "{{ vars.machine_api_key }}" [http.services.sciencemesh] address = "0.0.0.0:443" provider_domain = "{{ vars.provider_domain }}" -mesh_directory_url = "{{ vars.mesh_directory_url }}" +mesh_directory_url = "https://sciencemesh.cesnet.cz/iop/meshdir" ocm_mount_point = "/sciencemesh" [http.services.sciencemesh.smtp_credentials] diff --git a/tests/sciencemesh/scripts/reva-run.sh b/tests/sciencemesh/scripts/reva-run.sh index caba9df13c..8bf4a270fa 100755 --- a/tests/sciencemesh/scripts/reva-run.sh +++ b/tests/sciencemesh/scripts/reva-run.sh @@ -5,10 +5,11 @@ mkdir -p /revad/configs cp /etc/revad/sciencemesh*.toml /revad/configs/ cp /etc/revad/providers.testnet.json /revad/configs/providers.testnet.json -# substitute placeholders with correct names. +# substitute placeholders with correct values. 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 +sed -i "s/your.revad.org/${HOST}.docker/g" /revad/configs/sciencemesh*.toml +sed -i "s/your.efss.org/${HOST//reva/}.docker/g" /revad/configs/sciencemesh.toml +sed -i "/^mesh_directory_url /s/=.*$/= 'https:\/\/meshdir\.docker\/meshdir'/" /revad/configs/sciencemesh.toml cp /etc/revad/tls/*.crt /usr/local/share/ca-certificates/ update-ca-certificates