From 740d58cc82b2fe992f2c3023eefad400f85465da Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte <39946305+gmgigi96@users.noreply.github.com> Date: Mon, 3 Jul 2023 10:47:10 +0200 Subject: [PATCH] new mono process ocm config (#4029) --- examples/ocmd/server-1.toml | 187 ++++++++++++++++++ examples/ocmd/server-1/ocmd-machine-auth.toml | 12 -- examples/ocmd/server-1/ocmd-outcoming.toml | 28 --- .../ocmd/server-1/ocmd-received-shares-1.toml | 18 -- examples/ocmd/server-1/ocmd-server-1.toml | 177 ----------------- examples/ocmd/server-2.toml | 187 ++++++++++++++++++ examples/ocmd/server-2/ocmd-machine-auth.toml | 12 -- examples/ocmd/server-2/ocmd-outcoming.toml | 28 --- .../ocmd/server-2/ocmd-received-shares-2.toml | 18 -- examples/ocmd/server-2/ocmd-server-2.toml | 168 ---------------- 10 files changed, 374 insertions(+), 461 deletions(-) create mode 100644 examples/ocmd/server-1.toml delete mode 100644 examples/ocmd/server-1/ocmd-machine-auth.toml delete mode 100644 examples/ocmd/server-1/ocmd-outcoming.toml delete mode 100644 examples/ocmd/server-1/ocmd-received-shares-1.toml delete mode 100644 examples/ocmd/server-1/ocmd-server-1.toml create mode 100644 examples/ocmd/server-2.toml delete mode 100644 examples/ocmd/server-2/ocmd-machine-auth.toml delete mode 100644 examples/ocmd/server-2/ocmd-outcoming.toml delete mode 100644 examples/ocmd/server-2/ocmd-received-shares-2.toml delete mode 100644 examples/ocmd/server-2/ocmd-server-2.toml diff --git a/examples/ocmd/server-1.toml b/examples/ocmd/server-1.toml new file mode 100644 index 0000000000..ebff43f3de --- /dev/null +++ b/examples/ocmd/server-1.toml @@ -0,0 +1,187 @@ +[shared] +gatewaysvc = "{{ grpc.services.gateway.address }}" + +[vars] +machine_api_key = "machine-api-key" +provider_domain = "cernbox.cern.ch" + +[grpc.services.gateway] +address = "0.0.0.0:19000" +authregistrysvc = "{{ grpc.services.authregistry.address }}" +appregistrysvc = "{{ grpc.services.appregistry.address }}" +storageregistrysvc = "{{ grpc.services.storageregistry.address }}" +userprovidersvc = "{{ grpc.services.userprovider.address }}" +usershareprovidersvc = "{{ grpc.services.usershareprovider.address }}" +ocmcoresvc = "{{ grpc.services.ocmcore.address }}" +ocmshareprovidersvc = "{{ grpc.services.ocmshareprovider.address }}" +ocminvitemanagersvc = "{{ grpc.services.ocminvitemanager.address }}" +ocmproviderauthorizersvc = "{{ grpc.services.ocmproviderauthorizer.address }}" +datagateway = "http://localhost:{{ http.services.datagateway.address.port }}/data" +transfer_expires = 6 # give it a moment +commit_share_to_storage_grant = true +commit_share_to_storage_ref = true + +[grpc.services.authregistry] +driver = "static" + +[grpc.services.authregistry.drivers.static.rules] +basic = "{{ grpc.services.authprovider[0].address }}" +machine = "{{ grpc.services.authprovider[1].address }}" +ocmshares = "{{ grpc.services.authprovider[2].address }}" + +[grpc.services.appregistry] +driver = "static" + +[grpc.services.appprovider] +driver = "demo" +app_provider_url = "{{ grpc.services.appprovider.address }}" + +[grpc.services.storageregistry] +driver = "static" + +[grpc.services.storageregistry.drivers.static] +home_provider = "/home" + +[grpc.services.storageregistry.drivers.static.rules] +"/home" = { address = "{{ grpc.services.storageprovider[0].address }}" } +"123e4567-e89b-12d3-a456-426655440000" = { address = "{{ grpc.services.storageprovider[0].address }}" } +"/ocm" = { address = "{{ grpc.services.storageprovider[1].address }}" } +"ocm" = { address = "{{ grpc.services.storageprovider[1].address }}" } +"/sciencemesh" = { address = "{{ grpc.services.storageprovider[2].address }}" } +"sciencemesh" = { address = "{{ grpc.services.storageprovider[2].address }}" } + +[grpc.services.usershareprovider] +driver = "memory" + +[grpc.services.ocmcore] +driver = "json" + +# Note that ocmcore and ocmshareprovider should use the same file for storing the shares. +[grpc.services.ocmcore.drivers.json] +file = "/var/tmp/reva/shares_server_1.json" + +[grpc.services.ocminvitemanager] +driver = "json" +provider_domain = "{{ vars.provider_domain }}" + +[grpc.services.ocminvitemanager.drivers.json] +file = "/var/tmp/reva/invites_server_1.json" + +[grpc.services.ocmshareprovider] +driver = "json" +webdav_endpoint = "http://localhost:{{ http.services.ocdav.address.port }}" +provider_domain = "{{ vars.provider_domain }}" + +[grpc.services.ocmshareprovider.drivers.json] +file = "/var/tmp/reva/shares_server_1.json" + +[grpc.services.ocmproviderauthorizer] +driver = "json" + +[grpc.services.ocmproviderauthorizer.drivers.json] +providers = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/providers.demo.json" + +################################################################ +########## STORAGE PROVIDERS ########## +################################################################ +[[grpc.services.storageprovider]] +driver = "localhome" +mount_path = "/home" +mount_id = "123e4567-e89b-12d3-a456-426655440000" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data" +enable_home_creation = true + +[grpc.services.storageprovider.drivers.localhome] +user_layout = "{{.Username}}" + + +[[grpc.services.storageprovider]] +driver = "ocmoutcoming" +mount_path = "/ocm" +mount_id = "ocm" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[1].address.port }}/data" + +[grpc.services.storageprovider.drivers.ocmoutcoming] +machine_secret = "machine-api-key" + + +[[grpc.services.storageprovider]] +driver = "ocmreceived" +mount_path = "/sciencemesh" +mount_id = "sciencemesh" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[2].address.port }}/data" + +################################################################ +########## AUTH PROVIDERS ########## +################################################################ +[[grpc.services.authprovider]] +auth_manager = "json" + +[grpc.services.authprovider.auth_managers.json] +users = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/users.demo.json" + + +[[grpc.services.authprovider]] +auth_manager = "machine" + +[grpc.services.authprovider.auth_managers.machine] +api_key = "{{ vars.machine_api_key }}" +gateway_addr = "{{ grpc.services.gateway.address }}" + + +[[grpc.services.authprovider]] +auth_manager = "ocmshares" + +################################################################ +########## USER PROVIDER ########## +################################################################ +[grpc.services.userprovider] +driver = "json" + +[grpc.services.userprovider.drivers.json] +users = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/users.demo.json" + +################################################################ +########## DATA PROVIDERS ########## +################################################################ +[[http.services.dataprovider]] +driver = "localhome" + +[http.services.dataprovider.drivers.localhome] +user_layout = "{{.Username}}" + +[[http.services.dataprovider]] +driver = "ocmoutcoming" + +[http.services.dataprovider.drivers.ocmoutcoming] +machine_secret = "{{ vars.machine_api_key }}" + +[[http.services.dataprovider]] +driver = "ocmreceived" + +[http.services.ocmd] +address = "0.0.0.0:8080" +expose_recipient_display_name = true + +[http.services.ocmprovider] +ocm_prefix = "ocm" +provider = "reva@cern" +endpoint = "http://localhost:{{ http.services.ocmd.address.port }}" +enable_webapp = true +enable_datatx = true + +[http.services.ocs] +prefix = "ocs" + +[http.services.ocdav] +address = "0.0.0.0:8080" + +[http.services.datagateway] +address = "0.0.0.0:8080" + +[http.services.appprovider] + +[http.middlewares.cors] diff --git a/examples/ocmd/server-1/ocmd-machine-auth.toml b/examples/ocmd/server-1/ocmd-machine-auth.toml deleted file mode 100644 index 0fb314f986..0000000000 --- a/examples/ocmd/server-1/ocmd-machine-auth.toml +++ /dev/null @@ -1,12 +0,0 @@ -[shared] -gatewaysvc = "localhost:19000" - -[grpc] -address = "localhost:19030" - -[grpc.services.authprovider] -auth_manager = "machine" - -[grpc.services.authprovider.auth_managers.machine] -api_key = "machine-api-key" -gateway_addr = "localhost:19000" diff --git a/examples/ocmd/server-1/ocmd-outcoming.toml b/examples/ocmd/server-1/ocmd-outcoming.toml deleted file mode 100644 index 3461eaf242..0000000000 --- a/examples/ocmd/server-1/ocmd-outcoming.toml +++ /dev/null @@ -1,28 +0,0 @@ -[shared] -gatewaysvc = "localhost:19000" - -[grpc] -address = "localhost:19020" - -[grpc.services.storageprovider] -driver = "ocmoutcoming" -mount_path = "/ocm" -mount_id = "ocm" -expose_data_server = true -data_server_url = "http://localhost:19021/data" - -[grpc.services.storageprovider.drivers.ocmoutcoming] -machine_secret = "machine-api-key" - -[grpc.services.authprovider] -auth_manager = "ocmshares" - - -[http] -address = "localhost:19021" - -[http.services.dataprovider] -driver = "ocmoutcoming" - -[http.services.dataprovider.drivers.ocmoutcoming] -machine_secret = "machine-api-key" diff --git a/examples/ocmd/server-1/ocmd-received-shares-1.toml b/examples/ocmd/server-1/ocmd-received-shares-1.toml deleted file mode 100644 index 78f0782b4b..0000000000 --- a/examples/ocmd/server-1/ocmd-received-shares-1.toml +++ /dev/null @@ -1,18 +0,0 @@ -[shared] -gatewaysvc = "localhost:19000" - -[grpc] -address = "localhost:19010" - -[grpc.services.storageprovider] -driver = "ocmreceived" -mount_path = "/sciencemesh" -mount_id = "sciencemesh" -expose_data_server = true -data_server_url = "http://localhost:19011/data" - -[http] -address = "localhost:19011" - -[http.services.dataprovider] -driver = "ocmreceived" diff --git a/examples/ocmd/server-1/ocmd-server-1.toml b/examples/ocmd/server-1/ocmd-server-1.toml deleted file mode 100644 index 0d9adbf513..0000000000 --- a/examples/ocmd/server-1/ocmd-server-1.toml +++ /dev/null @@ -1,177 +0,0 @@ -[shared] -gatewaysvc = "localhost:19000" - -[grpc] -address = "0.0.0.0:19000" - -[grpc.services.gateway] -authregistrysvc = "localhost:19000" -appregistrysvc = "localhost:19000" -storageregistrysvc = "localhost:19000" -preferencessvc = "localhost:19000" -userprovidersvc = "localhost:19000" -usershareprovidersvc = "localhost:19000" -publicshareprovidersvc = "localhost:19000" -ocmcoresvc = "localhost:19000" -ocmshareprovidersvc = "localhost:19000" -ocminvitemanagersvc = "localhost:19000" -ocmproviderauthorizersvc = "localhost:19000" -datagateway = "http://localhost:19001/data" -transfer_expires = 6 # give it a moment -commit_share_to_storage_grant = true -commit_share_to_storage_ref = true - -[grpc.services.appregistry] -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"} -] - -[grpc.services.appprovider] -driver = "wopi" -appregistrysvc = "localhost:19000" - -[grpc.services.appprovider.drivers.wopi] -iop_secret = "shared-secret-with-wopiserver" -wopi_url = "http://0.0.0.0:8880/" -app_name = "Collabora" -app_url = "https://your-collabora-server.org:9980" - -[grpc.services.authregistry] -driver = "static" - -[grpc.services.authregistry.drivers.static.rules] -basic = "localhost:19000" -machine = "localhost:19030" -ocmshares = "localhost:19020" - -[grpc.services.storageregistry] -driver = "static" - -[grpc.services.storageregistry.drivers.static] -home_provider = "/home" - -[grpc.services.storageregistry.drivers.static.rules] -"/home" = { "address" = "localhost:19000" } -"123e4567-e89b-12d3-a456-426655440000" = { "address" = "localhost:19000" } -"/sciencemesh" = { "address" = "localhost:19010" } -"sciencemesh" = { "address" = "localhost:19010" } -"/ocm" = { "address" = "localhost:19020" } -"ocm" = { "address" = "localhost:19020" } - -[grpc.services.usershareprovider] -driver = "memory" - -[grpc.services.ocmcore] -driver = "json" - -# Note that ocmcore and ocmshareprovider should use the same file for storing the shares. -[grpc.services.ocmcore.drivers.json] -file = "/var/tmp/reva/shares_server_1.json" - -[grpc.services.ocminvitemanager] -driver = "json" -provider_domain = "cernbox.cern.ch" - -[grpc.services.ocminvitemanager.drivers.json] -file = "/var/tmp/reva/invites_server_1.json" - -[grpc.services.ocmshareprovider] -driver = "json" -webdav_endpoint = "http://localhost:19001" -provider_domain = "cernbox.cern.ch" - -[grpc.services.ocmshareprovider.drivers.json] -file = "/var/tmp/reva/shares_server_1.json" - -[grpc.services.ocmproviderauthorizer] -driver = "json" - -[grpc.services.ocmproviderauthorizer.drivers.json] -providers = "providers.demo.json" - -[grpc.services.publicshareprovider] -driver = "memory" - -[grpc.services.appregistry] -driver = "static" - -[grpc.services.appprovider] -driver = "demo" -app_provider_url = "localhost:19000" - -[grpc.services.storageprovider] -driver = "localhome" -mount_path = "/home" -mount_id = "123e4567-e89b-12d3-a456-426655440000" -expose_data_server = true -data_server_url = "http://localhost:19001/data" -enable_home_creation = true - -[grpc.services.storageprovider.drivers.localhome] -user_layout = "{{.Username}}" - -[grpc.services.authprovider] -auth_manager = "json" - -[grpc.services.authprovider.auth_managers.json] -users = "users.demo.json" - -[grpc.services.userprovider] -driver = "json" - -[grpc.services.userprovider.drivers.json] -users = "users.demo.json" - -[http] -address = "0.0.0.0:19001" - -[http.services.appprovider] - -[http.services.dataprovider] -driver = "localhome" - -[http.services.prometheus] -[http.services.sysinfo] - -[http.services.dataprovider.drivers.localhome] -user_layout = "{{.Username}}" - -[http.services.ocmd] -prefix = "ocm" - -[http.services.ocmprovider] -ocm_prefix = "ocm" -provider = "reva@cern" -endpoint = "http://localhost:19001" -enable_webapp = true -enable_datatx = true - -[http.middlewares.providerauthorizer] -driver = "json" - -[http.middlewares.providerauthorizer.drivers.json] -providers = "providers.demo.json" - -[http.services.ocs] -prefix = "ocs" - -[http.services.ocdav] - -[http.services.sciencemesh] -mesh_directory_url = 'https://sciencemesh.cesnet.cz/iop/meshdir' -provider_domain = 'your-domain-1.org' -ocm_mount_point = '/sciencemesh' - -[http.middlewares.cors] - -[http.middlewares.auth] -credential_chain = ["publicshares", "ocmshares", "basic", "bearer"] - diff --git a/examples/ocmd/server-2.toml b/examples/ocmd/server-2.toml new file mode 100644 index 0000000000..4ea85a969e --- /dev/null +++ b/examples/ocmd/server-2.toml @@ -0,0 +1,187 @@ +[shared] +gatewaysvc = "{{ grpc.services.gateway.address }}" + +[vars] +machine_api_key = "machine-api-key" +provider_domain = "cesnet.cz" + +[grpc.services.gateway] +address = "0.0.0.0:17000" +authregistrysvc = "{{ grpc.services.authregistry.address }}" +appregistrysvc = "{{ grpc.services.appregistry.address }}" +storageregistrysvc = "{{ grpc.services.storageregistry.address }}" +userprovidersvc = "{{ grpc.services.userprovider.address }}" +usershareprovidersvc = "{{ grpc.services.usershareprovider.address }}" +ocmcoresvc = "{{ grpc.services.ocmcore.address }}" +ocmshareprovidersvc = "{{ grpc.services.ocmshareprovider.address }}" +ocminvitemanagersvc = "{{ grpc.services.ocminvitemanager.address }}" +ocmproviderauthorizersvc = "{{ grpc.services.ocmproviderauthorizer.address }}" +datagateway = "http://localhost:{{ http.services.datagateway.address.port }}/data" +transfer_expires = 6 # give it a moment +commit_share_to_storage_grant = true +commit_share_to_storage_ref = true + +[grpc.services.authregistry] +driver = "static" + +[grpc.services.authregistry.drivers.static.rules] +basic = "{{ grpc.services.authprovider[0].address }}" +machine = "{{ grpc.services.authprovider[1].address }}" +ocmshares = "{{ grpc.services.authprovider[2].address }}" + +[grpc.services.appregistry] +driver = "static" + +[grpc.services.appprovider] +driver = "demo" +app_provider_url = "{{ grpc.services.appprovider.address }}" + +[grpc.services.storageregistry] +driver = "static" + +[grpc.services.storageregistry.drivers.static] +home_provider = "/home" + +[grpc.services.storageregistry.drivers.static.rules] +"/home" = { address = "{{ grpc.services.storageprovider[0].address }}" } +"123e4567-e89b-12d3-a456-426655440000" = { address = "{{ grpc.services.storageprovider[0].address }}" } +"/ocm" = { address = "{{ grpc.services.storageprovider[1].address }}" } +"ocm" = { address = "{{ grpc.services.storageprovider[1].address }}" } +"/sciencemesh" = { address = "{{ grpc.services.storageprovider[2].address }}" } +"sciencemesh" = { address = "{{ grpc.services.storageprovider[2].address }}" } + +[grpc.services.usershareprovider] +driver = "memory" + +[grpc.services.ocmcore] +driver = "json" + +# Note that ocmcore and ocmshareprovider should use the same file for storing the shares. +[grpc.services.ocmcore.drivers.json] +file = "/var/tmp/reva/shares_server_2.json" + +[grpc.services.ocminvitemanager] +driver = "json" +provider_domain = "{{ vars.provider_domain }}" + +[grpc.services.ocminvitemanager.drivers.json] +file = "/var/tmp/reva/invites_server_2.json" + +[grpc.services.ocmshareprovider] +driver = "json" +webdav_endpoint = "http://localhost:{{ http.services.ocdav.address.port }}" +provider_domain = "{{ vars.provider_domain }}" + +[grpc.services.ocmshareprovider.drivers.json] +file = "/var/tmp/reva/shares_server_2.json" + +[grpc.services.ocmproviderauthorizer] +driver = "json" + +[grpc.services.ocmproviderauthorizer.drivers.json] +providers = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/providers.demo.json" + +################################################################ +########## STORAGE PROVIDERS ########## +################################################################ +[[grpc.services.storageprovider]] +driver = "localhome" +mount_path = "/home" +mount_id = "123e4567-e89b-12d3-a456-426655440000" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[0].address.port }}/data" +enable_home_creation = true + +[grpc.services.storageprovider.drivers.localhome] +user_layout = "{{.Username}}" + + +[[grpc.services.storageprovider]] +driver = "ocmoutcoming" +mount_path = "/ocm" +mount_id = "ocm" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[1].address.port }}/data" + +[grpc.services.storageprovider.drivers.ocmoutcoming] +machine_secret = "machine-api-key" + + +[[grpc.services.storageprovider]] +driver = "ocmreceived" +mount_path = "/sciencemesh" +mount_id = "sciencemesh" +expose_data_server = true +data_server_url = "http://localhost:{{ http.services.dataprovider[2].address.port }}/data" + +################################################################ +########## AUTH PROVIDERS ########## +################################################################ +[[grpc.services.authprovider]] +auth_manager = "json" + +[grpc.services.authprovider.auth_managers.json] +users = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/users.demo.json" + + +[[grpc.services.authprovider]] +auth_manager = "machine" + +[grpc.services.authprovider.auth_managers.machine] +api_key = "{{ vars.machine_api_key }}" +gateway_addr = "{{ grpc.services.gateway.address }}" + + +[[grpc.services.authprovider]] +auth_manager = "ocmshares" + +################################################################ +########## USER PROVIDER ########## +################################################################ +[grpc.services.userprovider] +driver = "json" + +[grpc.services.userprovider.drivers.json] +users = "/home/gianmaria/Documenti/CERN/reva2/examples/ocmd/users.demo.json" + +################################################################ +########## DATA PROVIDERS ########## +################################################################ +[[http.services.dataprovider]] +driver = "localhome" + +[http.services.dataprovider.drivers.localhome] +user_layout = "{{.Username}}" + +[[http.services.dataprovider]] +driver = "ocmoutcoming" + +[http.services.dataprovider.drivers.ocmoutcoming] +machine_secret = "{{ vars.machine_api_key }}" + +[[http.services.dataprovider]] +driver = "ocmreceived" + +[http.services.ocmd] +address = "0.0.0.0:80" +expose_recipient_display_name = true + +[http.services.ocmprovider] +ocm_prefix = "ocm" +provider = "reva@cesnet" +endpoint = "http://localhost:{{ http.services.ocmd.address.port }}" +enable_webapp = true +enable_datatx = true + +[http.services.ocs] +prefix = "ocs" + +[http.services.ocdav] +address = "0.0.0.0:80" + +[http.services.datagateway] +address = "0.0.0.0:80" + +[http.services.appprovider] + +[http.middlewares.cors] diff --git a/examples/ocmd/server-2/ocmd-machine-auth.toml b/examples/ocmd/server-2/ocmd-machine-auth.toml deleted file mode 100644 index dc4854b472..0000000000 --- a/examples/ocmd/server-2/ocmd-machine-auth.toml +++ /dev/null @@ -1,12 +0,0 @@ -[shared] -gatewaysvc = "localhost:17000" - -[grpc] -address = "localhost:17030" - -[grpc.services.authprovider] -auth_manager = "machine" - -[grpc.services.authprovider.auth_managers.machine] -api_key = "machine-api-key" -gateway_addr = "localhost:17000" diff --git a/examples/ocmd/server-2/ocmd-outcoming.toml b/examples/ocmd/server-2/ocmd-outcoming.toml deleted file mode 100644 index 7bf1a59f32..0000000000 --- a/examples/ocmd/server-2/ocmd-outcoming.toml +++ /dev/null @@ -1,28 +0,0 @@ -[shared] -gatewaysvc = "localhost:17000" - -[grpc] -address = "localhost:17020" - -[grpc.services.storageprovider] -driver = "ocmoutcoming" -mount_path = "/ocm" -mount_id = "ocm" -expose_data_server = true -data_server_url = "http://localhost:17021/data" - -[grpc.services.storageprovider.drivers.ocmoutcoming] -machine_secret = "machine-api-key" - -[grpc.services.authprovider] -auth_manager = "ocmshares" - - -[http] -address = "localhost:17021" - -[http.services.dataprovider] -driver = "ocmoutcoming" - -[http.services.dataprovider.drivers.ocmoutcoming] -machine_secret = "machine-api-key" diff --git a/examples/ocmd/server-2/ocmd-received-shares-2.toml b/examples/ocmd/server-2/ocmd-received-shares-2.toml deleted file mode 100644 index 05cb2ee22c..0000000000 --- a/examples/ocmd/server-2/ocmd-received-shares-2.toml +++ /dev/null @@ -1,18 +0,0 @@ -[shared] -gatewaysvc = "localhost:17000" - -[grpc] -address = "localhost:17010" - -[grpc.services.storageprovider] -driver = "ocmreceived" -mount_path = "/sciencemesh" -mount_id = "sciencemesh" -expose_data_server = true -data_server_url = "http://localhost:17011/data" - -[http] -address = "localhost:17011" - -[http.services.dataprovider] -driver = "ocmreceived" diff --git a/examples/ocmd/server-2/ocmd-server-2.toml b/examples/ocmd/server-2/ocmd-server-2.toml deleted file mode 100644 index 755d00116e..0000000000 --- a/examples/ocmd/server-2/ocmd-server-2.toml +++ /dev/null @@ -1,168 +0,0 @@ -[shared] -gatewaysvc = "localhost:17000" - -[grpc] -address = "0.0.0.0:17000" - -[grpc.services.gateway] -authregistrysvc = "localhost:17000" -appregistrysvc = "localhost:17000" -storageregistrysvc = "localhost:17000" -preferencessvc = "localhost:17000" -userprovidersvc = "localhost:17000" -usershareprovidersvc = "localhost:17000" -publicshareprovidersvc = "localhost:17000" -ocmcoresvc = "localhost:17000" -ocmshareprovidersvc = "localhost:17000" -ocminvitemanagersvc = "localhost:17000" -ocmproviderauthorizersvc = "localhost:17000" -datagateway = "http://localhost:17001/data" -transfer_expires = 6 # give it a moment -commit_share_to_storage_grant = true -commit_share_to_storage_ref = true - -[grpc.services.appregistry] -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"} -] - -[grpc.services.appprovider] -driver = "wopi" -app_provider_url = "localhost:17000" - -[grpc.services.appprovider.drivers.wopi] -iop_secret = "shared-secret-with-wopiserver" -wopi_url = "http://0.0.0.0:8880/" -app_name = "Collabora" -app_url = "https://your-collabora-server.org:9980" - -[grpc.services.authregistry] -driver = "static" - -[grpc.services.authregistry.drivers.static.rules] -basic = "localhost:17000" -machine = "localhost:17030" -ocmshares = "localhost:17020" - -[grpc.services.storageregistry] -driver = "static" - -[grpc.services.storageregistry.drivers.static] -home_provider = "/home" - -[grpc.services.storageregistry.drivers.static.rules] -"/home" = { "address" = "localhost:17000" } -"123e4567-e89b-12d3-a456-426655440000" = { "address" = "localhost:17000" } -"/sciencemesh" = { "address" = "localhost:17010" } -"sciencemesh" = { "address" = "localhost:17010" } -"/ocm" = { "address" = "localhost:17020" } -"ocm" = { "address" = "localhost:17020" } - -[grpc.services.usershareprovider] -driver = "memory" - -[grpc.services.ocmcore] -driver = "json" - -# Note that ocmcore and ocmshareprovider should use the same file for storing the shares. -[grpc.services.ocmcore.drivers.json] -file = "/var/tmp/reva/shares_server_2.json" - -[grpc.services.ocminvitemanager] -driver = "json" -provider_domain = "cesnet.cz" - -[grpc.services.ocminvitemanager.drivers.json] -file = "/var/tmp/reva/invites_server_2.json" - -[grpc.services.ocmshareprovider] -driver = "json" -webdav_endpoint = "http://localhost:17001" -provider_domain = "cesnet.cz" - -[grpc.services.ocmshareprovider.drivers.json] -file = "/var/tmp/reva/shares_server_2.json" - -[grpc.services.ocmproviderauthorizer] -driver = "json" - -[grpc.services.ocmproviderauthorizer.drivers.json] -providers = "providers.demo.json" - -[grpc.services.publicshareprovider] -driver = "memory" - -[grpc.services.storageprovider] -driver = "localhome" -mount_path = "/home" -mount_id = "123e4567-e89b-12d3-a456-426655440000" -expose_data_server = true -data_server_url = "http://localhost:17001/data" -enable_home_creation = true - -[grpc.services.storageprovider.drivers.localhome] -user_layout = "{{.Username}}" - -[grpc.services.authprovider] -auth_manager = "json" - -[grpc.services.authprovider.auth_managers.json] -users = "users.demo.json" - -[grpc.services.userprovider] -driver = "json" - -[grpc.services.userprovider.drivers.json] -users = "users.demo.json" - -[http] -address = "0.0.0.0:17001" - -[http.services.appprovider] - -[http.services.dataprovider] -driver = "localhome" - -[http.services.prometheus] -[http.services.sysinfo] - -[http.services.dataprovider.drivers.localhome] -user_layout = "{{.Username}}" - -[http.services.ocmd] - -[http.services.ocmprovider] -provider = "reva@cesnet" -endpoint = "http://localhost:17001" -enable_webapp = true -enable_datatx = true - -[http.middlewares.providerauthorizer] -driver = "json" - -[http.middlewares.providerauthorizer.drivers.json] -providers = "providers.demo.json" - -[http.services.ocs] -prefix = "ocs" - -[http.services.ocdav] - -[http.services.sciencemesh] -mesh_directory_url = 'https://sciencemesh.cesnet.cz/iop/meshdir' -provider_domain = 'your-domain.org' -ocm_mount_point = '/sciencemesh' - -[http.middlewares.cors] - -[http.middlewares.auth] -credential_chain = ["publicshares", "ocmshares", "basic", "bearer"] -