mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-05-06 19:40:42 -05:00
Merge pull request #644 from owncloud/rename-reva
Rename ocis-reva to storage
This commit is contained in:
Michael Barz
+24
-24
@@ -5,7 +5,7 @@ config = {
|
||||
'konnectd':'',
|
||||
'ocis-phoenix':'',
|
||||
'ocis-pkg':'',
|
||||
'ocis-reva':'',
|
||||
'storage':'',
|
||||
'ocs':'',
|
||||
'proxy':'',
|
||||
'settings':'frontend',
|
||||
@@ -122,7 +122,7 @@ def main(ctx):
|
||||
pipelines['depends_on'] = []
|
||||
else:
|
||||
pipelines = before + stages + after
|
||||
|
||||
|
||||
return pipelines
|
||||
|
||||
def testPipelines(ctx):
|
||||
@@ -327,8 +327,8 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo
|
||||
'pull': 'always',
|
||||
'environment' : {
|
||||
'TEST_SERVER_URL': 'https://ocis-server:9200',
|
||||
'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/reva/' if storage == 'owncloud' else ''),
|
||||
'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/reva/data/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/root/nodes/root/*'),
|
||||
'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/' if storage == 'owncloud' else ''),
|
||||
'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/ocis/owncloud/data/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/*'),
|
||||
'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
|
||||
'TEST_OCIS':'true',
|
||||
'BEHAT_FILTER_TAGS': '~@skipOnOcis-%s-Storage' % ('OC' if storage == 'owncloud' else 'OCIS'),
|
||||
@@ -380,8 +380,8 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
|
||||
'pull': 'always',
|
||||
'environment' : {
|
||||
'TEST_SERVER_URL': 'https://ocis-server:9200',
|
||||
'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/reva/' if storage == 'owncloud' else ''),
|
||||
'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/reva/data/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/root/nodes/root/*'),
|
||||
'OCIS_REVA_DATA_ROOT': '%s' % ('/srv/app/tmp/ocis/owncloud/' if storage == 'owncloud' else ''),
|
||||
'DELETE_USER_DATA_CMD': '%s' % ('rm -rf /srv/app/tmp/ocis/owncloud/*' if storage == 'owncloud' else 'rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/*'),
|
||||
'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton',
|
||||
'TEST_OCIS':'true',
|
||||
'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage',
|
||||
@@ -445,7 +445,7 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = '', stor
|
||||
'SERVER_HOST': 'https://ocis-server:9200',
|
||||
'BACKEND_HOST': 'https://ocis-server:9200',
|
||||
'RUN_ON_OCIS': 'true',
|
||||
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva',
|
||||
'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud',
|
||||
'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
|
||||
'PHOENIX_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json',
|
||||
'TEST_TAGS': 'not @skipOnOCIS and not @skip',
|
||||
@@ -1156,22 +1156,22 @@ def ocisServer(storage):
|
||||
'detach': True,
|
||||
'environment' : {
|
||||
#'OCIS_LOG_LEVEL': 'debug',
|
||||
'REVA_STORAGE_HOME_DRIVER': '%s' % (storage),
|
||||
'REVA_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
|
||||
'REVA_STORAGE_OC_DRIVER': '%s' % (storage),
|
||||
'REVA_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
|
||||
'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
|
||||
'REVA_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/root',
|
||||
'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root',
|
||||
'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data',
|
||||
'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
|
||||
'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
|
||||
'REVA_LDAP_IDP': 'https://ocis-server:9200',
|
||||
'REVA_OIDC_ISSUER': 'https://ocis-server:9200',
|
||||
'STORAGE_STORAGE_HOME_DRIVER': '%s' % (storage),
|
||||
'STORAGE_STORAGE_HOME_DATA_DRIVER': '%s' % (storage),
|
||||
'STORAGE_STORAGE_OC_DRIVER': '%s' % (storage),
|
||||
'STORAGE_STORAGE_OC_DATA_DRIVER': '%s' % (storage),
|
||||
'STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/',
|
||||
'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
|
||||
'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
|
||||
'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
|
||||
'STORAGE_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
|
||||
'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
|
||||
'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
|
||||
'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
|
||||
'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
|
||||
'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
|
||||
'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
|
||||
'REVA_FRONTEND_URL': 'https://ocis-server:9200',
|
||||
'STORAGE_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data',
|
||||
'STORAGE_DATAGATEWAY_URL': 'https://ocis-server:9200/data',
|
||||
'STORAGE_FRONTEND_URL': 'https://ocis-server:9200',
|
||||
'PHOENIX_WEB_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json',
|
||||
'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ocis/tests/config/drone/identifier-registration.yml',
|
||||
'KONNECTD_ISS': 'https://ocis-server:9200',
|
||||
@@ -1180,8 +1180,8 @@ def ocisServer(storage):
|
||||
},
|
||||
'commands': [
|
||||
'apk add mailcap', # install /etc/mime.types
|
||||
'mkdir -p /srv/app/tmp/reva',
|
||||
'mkdir -p /srv/app/tmp/ocis/root/nodes',
|
||||
'mkdir -p /srv/app/tmp/ocis/owncloud/data/',
|
||||
'mkdir -p /srv/app/tmp/ocis/storage/users/',
|
||||
'ocis/bin/ocis server'
|
||||
],
|
||||
'volumes': [
|
||||
|
||||
+3
-2
@@ -1,7 +1,8 @@
|
||||
*/coverage.out
|
||||
|
||||
/ocis/bin
|
||||
/ocis/dist
|
||||
/**/config
|
||||
/**/bin
|
||||
/**/dist
|
||||
/hugo
|
||||
*.key
|
||||
*crt
|
||||
|
||||
@@ -1,656 +0,0 @@
|
||||
---
|
||||
title: "Configuration"
|
||||
date: "2020-09-21T13:14:49+0200"
|
||||
weight: 20
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocFilePath: configuration.md
|
||||
---
|
||||
|
||||
{{< toc >}}
|
||||
|
||||
## Configuration
|
||||
|
||||
oCIS Single Binary is not responsible for configuring extensions. Instead, each extension could either be configured by environment variables, cli flags or config files.
|
||||
|
||||
Each extension has its dedicated documentation page (e.g. https://owncloud.github.io/extensions/ocis_proxy/configuration) which lists all possible configurations. Config files and environment variables are picked up if you use the `./bin/ocis server` command within the oCIS single binary. Command line flags must be set explicitly on the extensions subcommands.
|
||||
|
||||
### Configuration using config files
|
||||
|
||||
Out of the box extensions will attempt to read configuration details from:
|
||||
|
||||
```console
|
||||
/etc/ocis
|
||||
$HOME/.ocis
|
||||
./config
|
||||
```
|
||||
|
||||
For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*.
|
||||
|
||||
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.
|
||||
|
||||
### Envrionment variables
|
||||
|
||||
If you prefer to configure the service with environment variables you can see the available variables below.
|
||||
|
||||
### Commandline flags
|
||||
|
||||
If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
|
||||
|
||||
## Root Command
|
||||
|
||||
Example service for Reva/oCIS
|
||||
|
||||
Usage: `ocis-reva [global options] command [command options] [arguments...]`
|
||||
|
||||
--config-file | $REVA_CONFIG_FILE
|
||||
: Path to config file.
|
||||
|
||||
--log-level | $REVA_LOG_LEVEL
|
||||
: Set logging level. Default: `info`.
|
||||
|
||||
--log-pretty | $REVA_LOG_PRETTY
|
||||
: Enable pretty logging.
|
||||
|
||||
--log-color | $REVA_LOG_COLOR
|
||||
: Enable colored logging.
|
||||
|
||||
## Sub Commands
|
||||
|
||||
### ocis-reva auth-basic
|
||||
|
||||
Start reva authprovider for basic auth
|
||||
|
||||
Usage: `ocis-reva auth-basic [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_AUTH_BASIC_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9147`.
|
||||
|
||||
--auth-driver | $REVA_AUTH_DRIVER
|
||||
: auth driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
|
||||
|
||||
--auth-json | $REVA_AUTH_JSON
|
||||
: Path to users.json file.
|
||||
|
||||
--network | $REVA_AUTH_BASIC_NETWORK
|
||||
: Network to use for the reva auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_AUTH_BASIC_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_AUTH_BASIC_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9146`.
|
||||
|
||||
--url | $REVA_AUTH_BASIC_URL
|
||||
: URL to use for the reva service. Default: `localhost:9146`.
|
||||
|
||||
### ocis-reva frontend
|
||||
|
||||
Start reva frontend service
|
||||
|
||||
Usage: `ocis-reva frontend [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_FRONTEND_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9141`.
|
||||
|
||||
--transfer-secret | $REVA_TRANSFER_SECRET
|
||||
: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
|
||||
|
||||
--webdav-namespace | $WEBDAV_NAMESPACE
|
||||
: Namespace prefix for the /webdav endpoint. Default: `/home/`.
|
||||
|
||||
--dav-files-namespace | $DAV_FILES_NAMESPACE
|
||||
: Namespace prefix for the webdav /dav/files endpoint. Default: `/oc/`.
|
||||
|
||||
--network | $REVA_FRONTEND_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_FRONTEND_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $REVA_FRONTEND_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9140`.
|
||||
|
||||
--url | $REVA_FRONTEND_URL
|
||||
: URL to use for the reva service. Default: `https://localhost:9200`.
|
||||
|
||||
--datagateway-prefix | $REVA_FRONTEND_DATAGATEWAY_PREFIX
|
||||
: datagateway prefix. Default: `data`.
|
||||
|
||||
--ocdav-prefix | $REVA_FRONTEND_OCDAV_PREFIX
|
||||
: owncloud webdav endpoint prefix.
|
||||
|
||||
--ocs-prefix | $REVA_FRONTEND_OCS_PREFIX
|
||||
: open collaboration services endpoint prefix. Default: `ocs`.
|
||||
|
||||
--gateway-url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva gateway service. Default: `localhost:9142`.
|
||||
|
||||
--upload-disable-tus | $REVA_FRONTEND_UPLOAD_DISABLE_TUS
|
||||
: Disables TUS upload mechanism. Default: `false`.
|
||||
|
||||
--upload-http-method-override | $REVA_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE
|
||||
: Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH.
|
||||
|
||||
### ocis-reva gateway
|
||||
|
||||
Start reva gateway
|
||||
|
||||
Usage: `ocis-reva gateway [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_GATEWAY_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9143`.
|
||||
|
||||
--transfer-secret | $REVA_TRANSFER_SECRET
|
||||
: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
|
||||
|
||||
--network | $REVA_GATEWAY_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_GATEWAY_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_GATEWAY_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9142`.
|
||||
|
||||
--url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva service. Default: `localhost:9142`.
|
||||
|
||||
--commit-share-to-storage-grant | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT
|
||||
: Commit shares to the share manager. Default: `true`.
|
||||
|
||||
--commit-share-to-storage-ref | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF
|
||||
: Commit shares to the storage. Default: `true`.
|
||||
|
||||
--share-folder | $REVA_GATEWAY_SHARE_FOLDER
|
||||
: mount shares in this folder of the home storage provider. Default: `Shares`.
|
||||
|
||||
--disable-home-creation-on-login | $REVA_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN
|
||||
: Disable creation of home folder on login.
|
||||
|
||||
--storage-registry-driver | $REVA_STORAGE_REGISTRY_DRIVER
|
||||
: driver of the storage registry. Default: `static`.
|
||||
|
||||
--storage-home-provider | $REVA_STORAGE_HOME_PROVIDER
|
||||
: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
|
||||
|
||||
--frontend-url | $REVA_FRONTEND_URL
|
||||
: URL to use for the reva service. Default: `https://localhost:9200`.
|
||||
|
||||
--datagateway-url | $REVA_DATAGATEWAY_URL
|
||||
: URL to use for the reva datagateway. Default: `https://localhost:9200/data`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
--auth-basic-url | $REVA_AUTH_BASIC_URL
|
||||
: URL to use for the reva service. Default: `localhost:9146`.
|
||||
|
||||
--auth-bearer-url | $REVA_AUTH_BEARER_URL
|
||||
: URL to use for the reva service. Default: `localhost:9148`.
|
||||
|
||||
--sharing-url | $REVA_SHARING_URL
|
||||
: URL to use for the reva service. Default: `localhost:9150`.
|
||||
|
||||
--storage-root-url | $REVA_STORAGE_ROOT_URL
|
||||
: URL to use for the reva service. Default: `localhost:9152`.
|
||||
|
||||
--storage-root-mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH
|
||||
: mount path. Default: `/`.
|
||||
|
||||
--storage-root-mount-id | $REVA_STORAGE_ROOT_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009152`.
|
||||
|
||||
--storage-home-url | $REVA_STORAGE_HOME_URL
|
||||
: URL to use for the reva service. Default: `localhost:9154`.
|
||||
|
||||
--storage-home-mount-path | $REVA_STORAGE_HOME_MOUNT_PATH
|
||||
: mount path. Default: `/home`.
|
||||
|
||||
--storage-home-mount-id | $REVA_STORAGE_HOME_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009154`.
|
||||
|
||||
--storage-eos-url | $REVA_STORAGE_EOS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9158`.
|
||||
|
||||
--storage-eos-mount-path | $REVA_STORAGE_EOS_MOUNT_PATH
|
||||
: mount path. Default: `/eos`.
|
||||
|
||||
--storage-eos-mount-id | $REVA_STORAGE_EOS_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
|
||||
|
||||
--storage-oc-url | $REVA_STORAGE_OC_URL
|
||||
: URL to use for the reva service. Default: `localhost:9162`.
|
||||
|
||||
--storage-oc-mount-path | $REVA_STORAGE_OC_MOUNT_PATH
|
||||
: mount path. Default: `/oc`.
|
||||
|
||||
--storage-oc-mount-id | $REVA_STORAGE_OC_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--public-link-url | $REVA_STORAGE_PUBLIC_LINK_URL
|
||||
: URL to use for the public links service. Default: `localhost:9178`.
|
||||
|
||||
--storage-public-link-mount-path | $REVA_STORAGE_PUBLIC_LINK_MOUNT_PATH
|
||||
: mount path. Default: `/public/`.
|
||||
|
||||
### ocis-reva sharing
|
||||
|
||||
Start reva sharing service
|
||||
|
||||
Usage: `ocis-reva sharing [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_SHARING_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9151`.
|
||||
|
||||
--network | $REVA_SHARING_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_SHARING_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_SHARING_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9150`.
|
||||
|
||||
--url | $REVA_SHARING_URL
|
||||
: URL to use for the reva service. Default: `localhost:9150`.
|
||||
|
||||
--user-driver | $REVA_SHARING_USER_DRIVER
|
||||
: driver to use for the UserShareProvider. Default: `json`.
|
||||
|
||||
--user-json-file | $REVA_SHARING_USER_JSON_FILE
|
||||
: file used to persist shares for the UserShareProvider. Default: `/var/tmp/reva/shares.json`.
|
||||
|
||||
--public-driver | $REVA_SHARING_PUBLIC_DRIVER
|
||||
: driver to use for the PublicShareProvider. Default: `json`.
|
||||
|
||||
### ocis-reva storage-home-data
|
||||
|
||||
Start reva storage-home-data service
|
||||
|
||||
Usage: `ocis-reva storage-home-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_HOME_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9157`.
|
||||
|
||||
--network | $REVA_STORAGE_HOME_DATA_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_HOME_DATA_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $REVA_STORAGE_HOME_DATA_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9156`.
|
||||
|
||||
--url | $REVA_STORAGE_HOME_DATA_URL
|
||||
: URL to use for the reva service. Default: `localhost:9156`.
|
||||
|
||||
--driver | $REVA_STORAGE_HOME_DATA_DRIVER
|
||||
: storage driver for home data mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--prefix | $REVA_STORAGE_HOME_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $REVA_STORAGE_HOME_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--enable-home | $REVA_STORAGE_HOME_ENABLE_HOME
|
||||
: enable the creation of home directories. Default: `true`.
|
||||
|
||||
--gateway-url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
### ocis-reva health
|
||||
|
||||
Check health status
|
||||
|
||||
Usage: `ocis-reva health [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_DEBUG_ADDR
|
||||
: Address to debug endpoint. Default: `0.0.0.0:9109`.
|
||||
|
||||
### ocis-reva storage-home
|
||||
|
||||
Start reva storage-home service
|
||||
|
||||
Usage: `ocis-reva storage-home [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_HOME_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9155`.
|
||||
|
||||
--network | $REVA_STORAGE_HOME_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_HOME_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_STORAGE_HOME_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9154`.
|
||||
|
||||
--url | $REVA_STORAGE_HOME_URL
|
||||
: URL to use for the reva service. Default: `localhost:9154`.
|
||||
|
||||
--driver | $REVA_STORAGE_HOME_DRIVER
|
||||
: storage driver for home mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--mount-path | $REVA_STORAGE_HOME_MOUNT_PATH
|
||||
: mount path. Default: `/home`.
|
||||
|
||||
--mount-id | $REVA_STORAGE_HOME_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--expose-data-server | $REVA_STORAGE_HOME_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $REVA_STORAGE_HOME_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9156/data`.
|
||||
|
||||
--enable-home | $REVA_STORAGE_HOME_ENABLE_HOME
|
||||
: enable the creation of home directories. Default: `true`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
### ocis-reva storage-eos-data
|
||||
|
||||
Start reva storage-eos-data service
|
||||
|
||||
Usage: `ocis-reva storage-eos-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9161`.
|
||||
|
||||
--network | $REVA_STORAGE_EOS_DATA_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_EOS_DATA_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $REVA_STORAGE_EOS_DATA_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9160`.
|
||||
|
||||
--url | $REVA_STORAGE_EOS_DATA_URL
|
||||
: URL to use for the reva service. Default: `localhost:9160`.
|
||||
|
||||
--driver | $REVA_STORAGE_EOS_DATA_DRIVER
|
||||
: storage driver for eos data mount: eg. local, eos, owncloud, ocis or s3. Default: `eos`.
|
||||
|
||||
--prefix | $REVA_STORAGE_EOS_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $REVA_STORAGE_EOS_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--gateway-url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
### ocis-reva reva-storage-public-link
|
||||
|
||||
Start reva storage-public-link service
|
||||
|
||||
Usage: `ocis-reva reva-storage-public-link [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_PUBLIC_LINK_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9179`.
|
||||
|
||||
--network | $REVA_STORAGE_PUBLIC_LINK_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_PUBLIC_LINK_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_STORAGE_PUBLIC_LINK_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9178`.
|
||||
|
||||
--url | $REVA_STORAGE_PUBLIC_LINK_URL
|
||||
: Address to bind reva service. Default: `localhost:9178`.
|
||||
|
||||
--mount-path | $REVA_STORAGE_PUBLIC_LINK_MOUNT_PATH
|
||||
: mount path. Default: `/public/`.
|
||||
|
||||
--gateway-url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva gateway service. Default: `localhost:9142`.
|
||||
|
||||
### ocis-reva users
|
||||
|
||||
Start reva users service
|
||||
|
||||
Usage: `ocis-reva users [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_SHARING_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9145`.
|
||||
|
||||
--network | $REVA_USERS_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_USERS_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_USERS_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9144`.
|
||||
|
||||
--url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
--driver | $REVA_USERS_DRIVER
|
||||
: user driver: 'demo', 'json', 'ldap', or 'rest'. Default: `ldap`.
|
||||
|
||||
--json-config | $REVA_USERS_JSON
|
||||
: Path to users.json file.
|
||||
|
||||
--rest-client-id | $REVA_REST_CLIENT_ID
|
||||
: User rest driver Client ID.
|
||||
|
||||
--rest-client-secret | $REVA_REST_CLIENT_SECRET
|
||||
: User rest driver Client Secret.
|
||||
|
||||
--rest-redis-address | $REVA_REST_REDIS_ADDRESS
|
||||
: Address for redis server. Default: `localhost:6379`.
|
||||
|
||||
--rest-redis-username | $REVA_REST_REDIS_USERNAME
|
||||
: Username for redis server.
|
||||
|
||||
--rest-redis-password | $REVA_REST_REDIS_PASSWORD
|
||||
: Password for redis server.
|
||||
|
||||
--rest-id-provider | $REVA_REST_ID_PROVIDER
|
||||
: The OIDC Provider.
|
||||
|
||||
--rest-api-base-url | $REVA_REST_API_BASE_URL
|
||||
: Base API Endpoint.
|
||||
|
||||
--rest-oidc-token-endpoint | $REVA_REST_OIDC_TOKEN_ENDPOINT
|
||||
: Endpoint to generate token to access the API.
|
||||
|
||||
--rest-target-api | $REVA_REST_TARGET_API
|
||||
: The target application.
|
||||
|
||||
### ocis-reva auth-bearer
|
||||
|
||||
Start reva authprovider for bearer auth
|
||||
|
||||
Usage: `ocis-reva auth-bearer [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_AUTH_BEARER_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9149`.
|
||||
|
||||
--oidc-issuer | $REVA_OIDC_ISSUER
|
||||
: OIDC issuer. Default: `https://localhost:9200`.
|
||||
|
||||
--oidc-insecure | $REVA_OIDC_INSECURE
|
||||
: OIDC allow insecure communication. Default: `true`.
|
||||
|
||||
--oidc-id-claim | $REVA_OIDC_ID_CLAIM
|
||||
: OIDC id claim. Default: `preferred_username`.
|
||||
|
||||
--oidc-uid-claim | $REVA_OIDC_UID_CLAIM
|
||||
: OIDC uid claim.
|
||||
|
||||
--oidc-gid-claim | $REVA_OIDC_GID_CLAIM
|
||||
: OIDC gid claim.
|
||||
|
||||
--network | $REVA_AUTH_BEARER_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_AUTH_BEARER_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_AUTH_BEARER_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9148`.
|
||||
|
||||
--url | $REVA_AUTH_BEARER_URL
|
||||
: URL to use for the reva service. Default: `localhost:9148`.
|
||||
|
||||
### ocis-reva storage-eos
|
||||
|
||||
Start reva storage-eos service
|
||||
|
||||
Usage: `ocis-reva storage-eos [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_EOS_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9159`.
|
||||
|
||||
--network | $REVA_STORAGE_EOS_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_EOS_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_STORAGE_EOS_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9158`.
|
||||
|
||||
--url | $REVA_STORAGE_EOS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9158`.
|
||||
|
||||
--driver | $REVA_STORAGE_EOS_DRIVER
|
||||
: storage driver for eos mount: eg. local, eos, owncloud, ocis or s3. Default: `eos`.
|
||||
|
||||
--mount-path | $REVA_STORAGE_EOS_MOUNT_PATH
|
||||
: mount path. Default: `/eos`.
|
||||
|
||||
--mount-id | $REVA_STORAGE_EOS_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
|
||||
|
||||
--expose-data-server | $REVA_STORAGE_EOS_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $REVA_STORAGE_EOS_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9160/data`.
|
||||
|
||||
### ocis-reva storage-oc
|
||||
|
||||
Start reva storage-oc service
|
||||
|
||||
Usage: `ocis-reva storage-oc [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_OC_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9163`.
|
||||
|
||||
--network | $REVA_STORAGE_OC_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_OC_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_STORAGE_OC_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9162`.
|
||||
|
||||
--url | $REVA_STORAGE_OC_URL
|
||||
: URL to use for the reva service. Default: `localhost:9162`.
|
||||
|
||||
--driver | $REVA_STORAGE_OC_DRIVER
|
||||
: storage driver for oc mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--mount-path | $REVA_STORAGE_OC_MOUNT_PATH
|
||||
: mount path. Default: `/oc`.
|
||||
|
||||
--mount-id | $REVA_STORAGE_OC_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--expose-data-server | $REVA_STORAGE_OC_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $REVA_STORAGE_OC_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9164/data`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
### ocis-reva storage-oc-data
|
||||
|
||||
Start reva storage-oc-data service
|
||||
|
||||
Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9165`.
|
||||
|
||||
--network | $REVA_STORAGE_OC_DATA_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_OC_DATA_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $REVA_STORAGE_OC_DATA_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9164`.
|
||||
|
||||
--url | $REVA_STORAGE_OC_DATA_URL
|
||||
: URL to use for the reva service. Default: `localhost:9164`.
|
||||
|
||||
--driver | $REVA_STORAGE_OC_DATA_DRIVER
|
||||
: storage driver for oc data mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--prefix | $REVA_STORAGE_OC_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $REVA_STORAGE_OC_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--gateway-url | $REVA_GATEWAY_URL
|
||||
: URL to use for the reva gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $REVA_USERS_URL
|
||||
: URL to use for the reva service. Default: `localhost:9144`.
|
||||
|
||||
### ocis-reva storage-root
|
||||
|
||||
Start reva storage-root service
|
||||
|
||||
Usage: `ocis-reva storage-root [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $REVA_STORAGE_ROOT_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9153`.
|
||||
|
||||
--network | $REVA_STORAGE_ROOT_NETWORK
|
||||
: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $REVA_STORAGE_ROOT_PROTOCOL
|
||||
: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $REVA_STORAGE_ROOT_ADDR
|
||||
: Address to bind reva service. Default: `0.0.0.0:9152`.
|
||||
|
||||
--url | $REVA_STORAGE_ROOT_URL
|
||||
: URL to use for the reva service. Default: `localhost:9152`.
|
||||
|
||||
--driver | $REVA_STORAGE_ROOT_DRIVER
|
||||
: storage driver for root mount: eg. local, eos, owncloud, ocis or s3. Default: `local`.
|
||||
|
||||
--mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH
|
||||
: mount path. Default: `/`.
|
||||
|
||||
--mount-id | $REVA_STORAGE_ROOT_MOUNT_ID
|
||||
: mount id. Default: `123e4567-e89b-12d3-a456-426655440001`.
|
||||
|
||||
--expose-data-server | $REVA_STORAGE_ROOT_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server.
|
||||
|
||||
--data-server-url | $REVA_STORAGE_ROOT_DATA_SERVER_URL
|
||||
: data server url.
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
---
|
||||
title: "Getting Started"
|
||||
date: 2018-05-02T00:00:00+00:00
|
||||
weight: 15
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocFilePath: getting-started.md
|
||||
---
|
||||
|
||||
{{< toc >}}
|
||||
|
||||
## Installation
|
||||
|
||||
So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it.
|
||||
|
||||
### Docker
|
||||
|
||||
Docker images for ocis-reva are hosted on https://hub.docker.com/r/owncloud/ocis-reva.
|
||||
|
||||
The `latest` tag always reflects the current master branch.
|
||||
|
||||
```console
|
||||
docker pull owncloud/ocis-reva
|
||||
```
|
||||
|
||||
#### Dependencies
|
||||
|
||||
- Running ocis-reva currently needs a working Redis caching server
|
||||
- The default storage location in the container is `/var/tmp/reva/data`. You may want to create a volume to persist the files in the primary storage
|
||||
|
||||
### Binaries
|
||||
|
||||
The pre-built binaries for different platforms are downloadable at https://download.owncloud.com/ocis/ocis-reva/ . Specific releases are organized in separate folders. They are in sync which every release tag on GitHub. The binaries from the current master branch can be found in https://download.owncloud.com/ocis/ocis-reva/testing/
|
||||
|
||||
```console
|
||||
curl https://download.owncloud.com/ocis/ocis/1.0.0-beta1/ocis-reva-1.0.0-beta1-darwin-amd64 --output ocis-reva
|
||||
chmod +x ocis
|
||||
./ocis-reva sharing
|
||||
```
|
||||
|
||||
#### Dependencies
|
||||
|
||||
- Running ocis currently needs a working Redis caching server
|
||||
- The default promary storage location is `/var/tmp/reva/data`. You can change that value by configuration.
|
||||
|
||||
## Usage
|
||||
|
||||
The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis-reva --help`.
|
||||
|
||||
### Health
|
||||
|
||||
The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes.
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-reva health --help
|
||||
{{< / highlight >}}
|
||||
@@ -1,47 +0,0 @@
|
||||
---
|
||||
title: "Releasing"
|
||||
date: 2020-05-22T00:00:00+00:00
|
||||
weight: 60
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocFilePath: releasing.md
|
||||
---
|
||||
|
||||
{{< toc >}}
|
||||
|
||||
To release a new version of ocis-reva, you have to follow a few simple steps.
|
||||
|
||||
## Preparation
|
||||
|
||||
1. Before releasing, make sure that reva has been [updated to the desired version]({{< ref "updating.md" >}})
|
||||
2. Create a new branch e.g. `release-x.x.x` where `x.x.x` is the version you want to release.
|
||||
3. Checkout the preparation branch.
|
||||
4. Create a new changelog folder and move the unreleased snippets there.
|
||||
{{< highlight txt >}}
|
||||
mkdir changelog/x.x.x_yyyy-MM-dd/ # yyyy-MM-dd is the current date
|
||||
mv changelog/unreleased/* changelog/x.x.x_yyyy-MM-dd/
|
||||
{{< / highlight >}}
|
||||
5. Commit and push the changes
|
||||
{{< highlight txt >}}
|
||||
git add --all
|
||||
git commit -m "prepare release x.x.x"
|
||||
git push origin release-x.x.x
|
||||
{{< / highlight >}}
|
||||
6. Create a pull request to the master branch.
|
||||
|
||||
## Release
|
||||
1. After the preparation branch has been merged update your local master.
|
||||
2. [Wait for CI](https://cloud.drone.io/owncloud/ocis-reva) to generate a commit for the changelog update
|
||||
3. Check out master (or make sure to check out the generated changelog commit in case of subsequent merges)
|
||||
{{< highlight txt >}}
|
||||
git checkout master
|
||||
git pull origin master
|
||||
{{< / highlight >}}
|
||||
4. Create a new tag (preferably signed) and replace the version number accordingly.
|
||||
{{< highlight txt >}}
|
||||
git tag -s vx.x.x -m "release vx.x.x"
|
||||
git push origin vx.x.x
|
||||
{{< / highlight >}}
|
||||
5. Wait for CI and check that the GitHub release was published.
|
||||
|
||||
Congratulations, you just released ocis-reva!
|
||||
@@ -1,52 +0,0 @@
|
||||
---
|
||||
title: "Users"
|
||||
date: 2020-01-16T00:00:00+00:00
|
||||
weight: 35
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocFilePath: users.md
|
||||
---
|
||||
|
||||
### Demo driver
|
||||
|
||||
This is a simple user driver for testing. It contains three users:
|
||||
```
|
||||
einstein:relativity
|
||||
marie:radioactivty
|
||||
richard:superfluidity
|
||||
```
|
||||
In order to use the `demo` driver you need to export the relevant environment variable:
|
||||
```
|
||||
export REVA_USERS_DRIVER=demo
|
||||
```
|
||||
|
||||
### JSON driver
|
||||
|
||||
In order to switch from the `ldap` driver to JSON based users you need to export the relevant environment variables:
|
||||
```
|
||||
export REVA_USERS_DRIVER=json
|
||||
export REVA_USERS_JSON=/path/to/users.json
|
||||
```
|
||||
|
||||
For the format of the users.json have a look at the [reva examples](https://github.com/cs3org/reva/blob/master/examples/separate/users.demo.json)
|
||||
|
||||
### LDAP driver
|
||||
|
||||
This is the default user driver.
|
||||
|
||||
If the below defaults don't match your environment change them accordingly:
|
||||
```
|
||||
export REVA_LDAP_HOSTNAME=localhost
|
||||
export REVA_LDAP_PORT=9126
|
||||
export REVA_LDAP_BASE_DN='dc=example,dc=org'
|
||||
export REVA_LDAP_USERFILTER='(&(objectclass=posixAccount)(cn=%s))'
|
||||
export REVA_LDAP_GROUPFILTER='(&(objectclass=posixGroup)(cn=%s))'
|
||||
export REVA_LDAP_BIND_DN='cn=reva,ou=sysusers,dc=example,dc=org'
|
||||
export REVA_LDAP_BIND_PASSWORD=reva
|
||||
export REVA_LDAP_SCHEMA_UID=uid
|
||||
export REVA_LDAP_SCHEMA_MAIL=mail
|
||||
export REVA_LDAP_SCHEMA_DISPLAYNAME=sn
|
||||
export REVA_LDAP_SCHEMA_CN=cn
|
||||
```
|
||||
|
||||
Then restart the `bin/ocis-reva users` and `bin/ocis-reva auth-basic` services for the changes to take effect.
|
||||
@@ -2,8 +2,8 @@
|
||||
title: "Reva"
|
||||
date: 2018-05-02T00:00:00+00:00
|
||||
weight: 10
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: _index.md
|
||||
---
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
title: "Building"
|
||||
date: 2018-05-02T00:00:00+00:00
|
||||
weight: 30
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: building.md
|
||||
---
|
||||
|
||||
As this project is built with Go, so you need to install that first. The installation of Go is out of the scope of this document, please follow the official documentation for [Go](https://golang.org/doc/install).To build this project you have to install Go >= v1.13. After the installation of the required tools you need to get the sources:
|
||||
|
||||
{{< highlight txt >}}
|
||||
git clone https://github.com/owncloud/ocis-reva.git
|
||||
cd ocis-reva
|
||||
git clone https://github.com/owncloud/ocis.git
|
||||
cd ocis/storage
|
||||
{{< / highlight >}}
|
||||
|
||||
All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`.
|
||||
@@ -0,0 +1,704 @@
|
||||
---
|
||||
title: "Configuration"
|
||||
date: "2020-10-05T21:57:18+0200"
|
||||
weight: 20
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: configuration.md
|
||||
---
|
||||
|
||||
{{< toc >}}
|
||||
|
||||
## Configuration
|
||||
|
||||
oCIS Single Binary is not responsible for configuring extensions. Instead, each extension could either be configured by environment variables, cli flags or config files.
|
||||
|
||||
Each extension has its dedicated documentation page (e.g. https://owncloud.github.io/extensions/ocis_proxy/configuration) which lists all possible configurations. Config files and environment variables are picked up if you use the `./bin/ocis server` command within the oCIS single binary. Command line flags must be set explicitly on the extensions subcommands.
|
||||
|
||||
### Configuration using config files
|
||||
|
||||
Out of the box extensions will attempt to read configuration details from:
|
||||
|
||||
```console
|
||||
/etc/ocis
|
||||
$HOME/.ocis
|
||||
./config
|
||||
```
|
||||
|
||||
For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*.
|
||||
|
||||
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.
|
||||
|
||||
### Envrionment variables
|
||||
|
||||
If you prefer to configure the service with environment variables you can see the available variables below.
|
||||
|
||||
### Commandline flags
|
||||
|
||||
If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
|
||||
|
||||
## Root Command
|
||||
|
||||
Storage service for oCIS
|
||||
|
||||
Usage: `storage [global options] command [command options] [arguments...]`
|
||||
|
||||
--config-file | $STORAGE_CONFIG_FILE
|
||||
: Path to config file.
|
||||
|
||||
--log-level | $STORAGE_LOG_LEVEL
|
||||
: Set logging level. Default: `info`.
|
||||
|
||||
--log-pretty | $STORAGE_LOG_PRETTY
|
||||
: Enable pretty logging.
|
||||
|
||||
--log-color | $STORAGE_LOG_COLOR
|
||||
: Enable colored logging.
|
||||
|
||||
## Sub Commands
|
||||
|
||||
### storage sharing
|
||||
|
||||
Start sharing service
|
||||
|
||||
Usage: `storage sharing [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_SHARING_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9151`.
|
||||
|
||||
--network | $STORAGE_SHARING_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_SHARING_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_SHARING_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9150`.
|
||||
|
||||
--url | $STORAGE_SHARING_URL
|
||||
: URL to use for the storage service. Default: `localhost:9150`.
|
||||
|
||||
--user-driver | $STORAGE_SHARING_USER_DRIVER
|
||||
: driver to use for the UserShareProvider. Default: `json`.
|
||||
|
||||
--user-json-file | $STORAGE_SHARING_USER_JSON_FILE
|
||||
: file used to persist shares for the UserShareProvider. Default: `/var/tmp/ocis/shares.json`.
|
||||
|
||||
--public-driver | $STORAGE_SHARING_PUBLIC_DRIVER
|
||||
: driver to use for the PublicShareProvider. Default: `json`.
|
||||
|
||||
### storage storage-eos
|
||||
|
||||
Start storage-eos service
|
||||
|
||||
Usage: `storage storage-eos [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_EOS_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9159`.
|
||||
|
||||
--network | $STORAGE_STORAGE_EOS_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_EOS_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_EOS_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9158`.
|
||||
|
||||
--url | $STORAGE_STORAGE_EOS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9158`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_EOS_DRIVER
|
||||
: storage driver for eos mount: eg. local, eos, owncloud, ocis or s3. Default: `eos`.
|
||||
|
||||
--mount-path | $STORAGE_STORAGE_EOS_MOUNT_PATH
|
||||
: mount path. Default: `/eos`.
|
||||
|
||||
--mount-id | $STORAGE_STORAGE_EOS_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
|
||||
|
||||
--expose-data-server | $STORAGE_STORAGE_EOS_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $STORAGE_STORAGE_EOS_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9160/data`.
|
||||
|
||||
### storage users
|
||||
|
||||
Start users service
|
||||
|
||||
Usage: `storage users [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_SHARING_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9145`.
|
||||
|
||||
--network | $STORAGE_USERS_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_USERS_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_USERS_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9144`.
|
||||
|
||||
--url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
--driver | $STORAGE_USERS_DRIVER
|
||||
: user driver: 'demo', 'json', 'ldap', or 'rest'. Default: `ldap`.
|
||||
|
||||
--json-config | $STORAGE_USERS_JSON
|
||||
: Path to users.json file.
|
||||
|
||||
--rest-client-id | $STORAGE_REST_CLIENT_ID
|
||||
: User rest driver Client ID.
|
||||
|
||||
--rest-client-secret | $STORAGE_REST_CLIENT_SECRET
|
||||
: User rest driver Client Secret.
|
||||
|
||||
--rest-redis-address | $STORAGE_REST_REDIS_ADDRESS
|
||||
: Address for redis server. Default: `localhost:6379`.
|
||||
|
||||
--rest-redis-username | $STORAGE_REST_REDIS_USERNAME
|
||||
: Username for redis server.
|
||||
|
||||
--rest-redis-password | $STORAGE_REST_REDIS_PASSWORD
|
||||
: Password for redis server.
|
||||
|
||||
--rest-id-provider | $STORAGE_REST_ID_PROVIDER
|
||||
: The OIDC Provider.
|
||||
|
||||
--rest-api-base-url | $STORAGE_REST_API_BASE_URL
|
||||
: Base API Endpoint.
|
||||
|
||||
--rest-oidc-token-endpoint | $STORAGE_REST_OIDC_TOKEN_ENDPOINT
|
||||
: Endpoint to generate token to access the API.
|
||||
|
||||
--rest-target-api | $STORAGE_REST_TARGET_API
|
||||
: The target application.
|
||||
|
||||
### storage gateway
|
||||
|
||||
Start gateway
|
||||
|
||||
Usage: `storage gateway [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_GATEWAY_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9143`.
|
||||
|
||||
--transfer-secret | $STORAGE_TRANSFER_SECRET
|
||||
: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
|
||||
|
||||
--network | $STORAGE_GATEWAY_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_GATEWAY_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_GATEWAY_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9142`.
|
||||
|
||||
--url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage service. Default: `localhost:9142`.
|
||||
|
||||
--commit-share-to-storage-grant | $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT
|
||||
: Commit shares to the share manager. Default: `true`.
|
||||
|
||||
--commit-share-to-storage-ref | $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF
|
||||
: Commit shares to the storage. Default: `true`.
|
||||
|
||||
--share-folder | $STORAGE_GATEWAY_SHARE_FOLDER
|
||||
: mount shares in this folder of the home storage provider. Default: `Shares`.
|
||||
|
||||
--disable-home-creation-on-login | $STORAGE_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN
|
||||
: Disable creation of home folder on login.
|
||||
|
||||
--storage-registry-driver | $STORAGE_STORAGE_REGISTRY_DRIVER
|
||||
: driver of the storage registry. Default: `static`.
|
||||
|
||||
--storage-home-provider | $STORAGE_STORAGE_HOME_PROVIDER
|
||||
: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
|
||||
|
||||
--frontend-url | $STORAGE_FRONTEND_URL
|
||||
: URL to use for the storage service. Default: `https://localhost:9200`.
|
||||
|
||||
--datagateway-url | $STORAGE_DATAGATEWAY_URL
|
||||
: URL to use for the storage datagateway. Default: `https://localhost:9200/data`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
--auth-basic-url | $STORAGE_AUTH_BASIC_URL
|
||||
: URL to use for the storage service. Default: `localhost:9146`.
|
||||
|
||||
--auth-bearer-url | $STORAGE_AUTH_BEARER_URL
|
||||
: URL to use for the storage service. Default: `localhost:9148`.
|
||||
|
||||
--sharing-url | $STORAGE_SHARING_URL
|
||||
: URL to use for the storage service. Default: `localhost:9150`.
|
||||
|
||||
--storage-root-url | $STORAGE_STORAGE_ROOT_URL
|
||||
: URL to use for the storage service. Default: `localhost:9152`.
|
||||
|
||||
--storage-root-mount-path | $STORAGE_STORAGE_ROOT_MOUNT_PATH
|
||||
: mount path. Default: `/`.
|
||||
|
||||
--storage-root-mount-id | $STORAGE_STORAGE_ROOT_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009152`.
|
||||
|
||||
--storage-home-url | $STORAGE_STORAGE_HOME_URL
|
||||
: URL to use for the storage service. Default: `localhost:9154`.
|
||||
|
||||
--storage-home-mount-path | $STORAGE_STORAGE_HOME_MOUNT_PATH
|
||||
: mount path. Default: `/home`.
|
||||
|
||||
--storage-home-mount-id | $STORAGE_STORAGE_HOME_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009154`.
|
||||
|
||||
--storage-eos-url | $STORAGE_STORAGE_EOS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9158`.
|
||||
|
||||
--storage-eos-mount-path | $STORAGE_STORAGE_EOS_MOUNT_PATH
|
||||
: mount path. Default: `/eos`.
|
||||
|
||||
--storage-eos-mount-id | $STORAGE_STORAGE_EOS_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
|
||||
|
||||
--storage-oc-url | $STORAGE_STORAGE_OC_URL
|
||||
: URL to use for the storage service. Default: `localhost:9162`.
|
||||
|
||||
--storage-oc-mount-path | $STORAGE_STORAGE_OC_MOUNT_PATH
|
||||
: mount path. Default: `/oc`.
|
||||
|
||||
--storage-oc-mount-id | $STORAGE_STORAGE_OC_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--public-link-url | $STORAGE_STORAGE_PUBLIC_LINK_URL
|
||||
: URL to use for the public links service. Default: `localhost:9178`.
|
||||
|
||||
--storage-public-link-mount-path | $STORAGE_STORAGE_PUBLIC_LINK_MOUNT_PATH
|
||||
: mount path. Default: `/public/`.
|
||||
|
||||
### storage storage
|
||||
|
||||
Storage service for oCIS
|
||||
|
||||
Usage: `storage storage [command options] [arguments...]`
|
||||
|
||||
--config-file | $STORAGE_CONFIG_FILE
|
||||
: Path to config file.
|
||||
|
||||
--log-level | $STORAGE_LOG_LEVEL
|
||||
: Set logging level. Default: `info`.
|
||||
|
||||
--log-pretty | $STORAGE_LOG_PRETTY
|
||||
: Enable pretty logging.
|
||||
|
||||
--log-color | $STORAGE_LOG_COLOR
|
||||
: Enable colored logging.
|
||||
|
||||
### storage storage-home
|
||||
|
||||
Start storage-home service
|
||||
|
||||
Usage: `storage storage-home [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_HOME_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9155`.
|
||||
|
||||
--network | $STORAGE_STORAGE_HOME_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_HOME_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_HOME_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9154`.
|
||||
|
||||
--url | $STORAGE_STORAGE_HOME_URL
|
||||
: URL to use for the storage service. Default: `localhost:9154`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_HOME_DRIVER
|
||||
: storage driver for home mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--mount-path | $STORAGE_STORAGE_HOME_MOUNT_PATH
|
||||
: mount path. Default: `/home`.
|
||||
|
||||
--mount-id | $STORAGE_STORAGE_HOME_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--expose-data-server | $STORAGE_STORAGE_HOME_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $STORAGE_STORAGE_HOME_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9156/data`.
|
||||
|
||||
--enable-home | $STORAGE_STORAGE_HOME_ENABLE_HOME
|
||||
: enable the creation of home directories. Default: `true`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
### storage storage-metadata
|
||||
|
||||
Start storage-metadata service
|
||||
|
||||
Usage: `storage storage-metadata [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_METADATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9217`.
|
||||
|
||||
--network | $STORAGE_STORAGE_METADATA_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--provider-addr | $STORAGE_STORAGE_METADATA_PROVIDER_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9215`.
|
||||
|
||||
--data-server-url | $STORAGE_STORAGE_METADATA_DATA_SERVER_URL
|
||||
: URL of the data-server the storage-provider uses. Default: `http://localhost:9216`.
|
||||
|
||||
--data-server-addr | $STORAGE_STORAGE_METADATA_DATA_SERVER_ADDR
|
||||
: Address to bind the metadata data-server to. Default: `0.0.0.0:9216`.
|
||||
|
||||
--storage-provider-driver | $STORAGE_STORAGE_METADATA_PROVIDER_DRIVER
|
||||
: storage driver for metadata mount: eg. local, eos, owncloud, ocis or s3. Default: `local`.
|
||||
|
||||
--data-provider-driver | $STORAGE_STORAGE_METADATA_DATA_PROVIDER_DRIVER
|
||||
: storage driver for data-provider mount: eg. local, eos, owncloud, ocis or s3. Default: `local`.
|
||||
|
||||
--storage-root | $STORAGE_STORAGE_METADATA_ROOT
|
||||
: the path to the metadata storage root. Default: `/var/tmp/ocis/metadata`.
|
||||
|
||||
### storage storage-oc
|
||||
|
||||
Start storage-oc service
|
||||
|
||||
Usage: `storage storage-oc [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_OC_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9163`.
|
||||
|
||||
--network | $STORAGE_STORAGE_OC_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_OC_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_OC_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9162`.
|
||||
|
||||
--url | $STORAGE_STORAGE_OC_URL
|
||||
: URL to use for the storage service. Default: `localhost:9162`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_OC_DRIVER
|
||||
: storage driver for oc mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--mount-path | $STORAGE_STORAGE_OC_MOUNT_PATH
|
||||
: mount path. Default: `/oc`.
|
||||
|
||||
--mount-id | $STORAGE_STORAGE_OC_MOUNT_ID
|
||||
: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
|
||||
|
||||
--expose-data-server | $STORAGE_STORAGE_OC_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server. Default: `false`.
|
||||
|
||||
--data-server-url | $STORAGE_STORAGE_OC_DATA_SERVER_URL
|
||||
: data server url. Default: `http://localhost:9164/data`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
### storage storage-oc-data
|
||||
|
||||
Start storage-oc-data service
|
||||
|
||||
Usage: `storage storage-oc-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_OC_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9165`.
|
||||
|
||||
--network | $STORAGE_STORAGE_OC_DATA_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_OC_DATA_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_OC_DATA_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9164`.
|
||||
|
||||
--url | $STORAGE_STORAGE_OC_DATA_URL
|
||||
: URL to use for the storage service. Default: `localhost:9164`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_OC_DATA_DRIVER
|
||||
: storage driver for oc data mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--prefix | $STORAGE_STORAGE_OC_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $STORAGE_STORAGE_OC_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--gateway-url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
### storage storage-public-link
|
||||
|
||||
Start storage-public-link service
|
||||
|
||||
Usage: `storage storage-public-link [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_PUBLIC_LINK_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9179`.
|
||||
|
||||
--network | $STORAGE_STORAGE_PUBLIC_LINK_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_PUBLIC_LINK_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_PUBLIC_LINK_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9178`.
|
||||
|
||||
--url | $STORAGE_STORAGE_PUBLIC_LINK_URL
|
||||
: Address to bind storage service. Default: `localhost:9178`.
|
||||
|
||||
--mount-path | $STORAGE_STORAGE_PUBLIC_LINK_MOUNT_PATH
|
||||
: mount path. Default: `/public/`.
|
||||
|
||||
--gateway-url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage gateway service. Default: `localhost:9142`.
|
||||
|
||||
### storage auth-bearer
|
||||
|
||||
Start authprovider for bearer auth
|
||||
|
||||
Usage: `storage auth-bearer [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_AUTH_BEARER_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9149`.
|
||||
|
||||
--oidc-issuer | $STORAGE_OIDC_ISSUER
|
||||
: OIDC issuer. Default: `https://localhost:9200`.
|
||||
|
||||
--oidc-insecure | $STORAGE_OIDC_INSECURE
|
||||
: OIDC allow insecure communication. Default: `true`.
|
||||
|
||||
--oidc-id-claim | $STORAGE_OIDC_ID_CLAIM
|
||||
: OIDC id claim. Default: `preferred_username`.
|
||||
|
||||
--oidc-uid-claim | $STORAGE_OIDC_UID_CLAIM
|
||||
: OIDC uid claim.
|
||||
|
||||
--oidc-gid-claim | $STORAGE_OIDC_GID_CLAIM
|
||||
: OIDC gid claim.
|
||||
|
||||
--network | $STORAGE_AUTH_BEARER_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_AUTH_BEARER_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_AUTH_BEARER_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9148`.
|
||||
|
||||
--url | $STORAGE_AUTH_BEARER_URL
|
||||
: URL to use for the storage service. Default: `localhost:9148`.
|
||||
|
||||
### storage frontend
|
||||
|
||||
Start frontend service
|
||||
|
||||
Usage: `storage frontend [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_FRONTEND_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9141`.
|
||||
|
||||
--transfer-secret | $STORAGE_TRANSFER_SECRET
|
||||
: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
|
||||
|
||||
--webdav-namespace | $WEBDAV_NAMESPACE
|
||||
: Namespace prefix for the /webdav endpoint. Default: `/home/`.
|
||||
|
||||
--dav-files-namespace | $DAV_FILES_NAMESPACE
|
||||
: Namespace prefix for the webdav /dav/files endpoint. Default: `/oc/`.
|
||||
|
||||
--network | $STORAGE_FRONTEND_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_FRONTEND_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $STORAGE_FRONTEND_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9140`.
|
||||
|
||||
--url | $STORAGE_FRONTEND_URL
|
||||
: URL to use for the storage service. Default: `https://localhost:9200`.
|
||||
|
||||
--datagateway-prefix | $STORAGE_FRONTEND_DATAGATEWAY_PREFIX
|
||||
: datagateway prefix. Default: `data`.
|
||||
|
||||
--ocdav-prefix | $STORAGE_FRONTEND_OCDAV_PREFIX
|
||||
: owncloud webdav endpoint prefix.
|
||||
|
||||
--ocs-prefix | $STORAGE_FRONTEND_OCS_PREFIX
|
||||
: open collaboration services endpoint prefix. Default: `ocs`.
|
||||
|
||||
--gateway-url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage gateway service. Default: `localhost:9142`.
|
||||
|
||||
--upload-disable-tus | $STORAGE_FRONTEND_UPLOAD_DISABLE_TUS
|
||||
: Disables TUS upload mechanism. Default: `false`.
|
||||
|
||||
--upload-http-method-override | $STORAGE_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE
|
||||
: Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH.
|
||||
|
||||
### storage auth-basic
|
||||
|
||||
Start authprovider for basic auth
|
||||
|
||||
Usage: `storage auth-basic [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_AUTH_BASIC_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9147`.
|
||||
|
||||
--auth-driver | $STORAGE_AUTH_DRIVER
|
||||
: auth driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
|
||||
|
||||
--auth-json | $STORAGE_AUTH_JSON
|
||||
: Path to users.json file.
|
||||
|
||||
--network | $STORAGE_AUTH_BASIC_NETWORK
|
||||
: Network to use for the storage auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_AUTH_BASIC_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_AUTH_BASIC_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9146`.
|
||||
|
||||
--url | $STORAGE_AUTH_BASIC_URL
|
||||
: URL to use for the storage service. Default: `localhost:9146`.
|
||||
|
||||
### storage health
|
||||
|
||||
Check health status
|
||||
|
||||
Usage: `storage health [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_DEBUG_ADDR
|
||||
: Address to debug endpoint. Default: `0.0.0.0:9109`.
|
||||
|
||||
### storage storage-eos-data
|
||||
|
||||
Start storage-eos-data service
|
||||
|
||||
Usage: `storage storage-eos-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_OC_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9161`.
|
||||
|
||||
--network | $STORAGE_STORAGE_EOS_DATA_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_EOS_DATA_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_EOS_DATA_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9160`.
|
||||
|
||||
--url | $STORAGE_STORAGE_EOS_DATA_URL
|
||||
: URL to use for the storage service. Default: `localhost:9160`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_EOS_DATA_DRIVER
|
||||
: storage driver for eos data mount: eg. local, eos, owncloud, ocis or s3. Default: `eos`.
|
||||
|
||||
--prefix | $STORAGE_STORAGE_EOS_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $STORAGE_STORAGE_EOS_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--gateway-url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
### storage storage-home-data
|
||||
|
||||
Start storage-home-data service
|
||||
|
||||
Usage: `storage storage-home-data [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_HOME_DATA_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9157`.
|
||||
|
||||
--network | $STORAGE_STORAGE_HOME_DATA_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_HOME_DATA_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `http`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_HOME_DATA_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9156`.
|
||||
|
||||
--url | $STORAGE_STORAGE_HOME_DATA_URL
|
||||
: URL to use for the storage service. Default: `localhost:9156`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_HOME_DATA_DRIVER
|
||||
: storage driver for home data mount: eg. local, eos, owncloud, ocis or s3. Default: `owncloud`.
|
||||
|
||||
--prefix | $STORAGE_STORAGE_HOME_DATA_PREFIX
|
||||
: prefix for the http endpoint, without leading slash. Default: `data`.
|
||||
|
||||
--temp-folder | $STORAGE_STORAGE_HOME_DATA_TEMP_FOLDER
|
||||
: temp folder. Default: `/var/tmp/`.
|
||||
|
||||
--enable-home | $STORAGE_STORAGE_HOME_ENABLE_HOME
|
||||
: enable the creation of home directories. Default: `true`.
|
||||
|
||||
--gateway-url | $STORAGE_GATEWAY_URL
|
||||
: URL to use for the storage gateway service. Default: `localhost:9142`.
|
||||
|
||||
--users-url | $STORAGE_USERS_URL
|
||||
: URL to use for the storage service. Default: `localhost:9144`.
|
||||
|
||||
### storage storage-root
|
||||
|
||||
Start storage-root service
|
||||
|
||||
Usage: `storage storage-root [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $STORAGE_STORAGE_ROOT_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9153`.
|
||||
|
||||
--network | $STORAGE_STORAGE_ROOT_NETWORK
|
||||
: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
|
||||
|
||||
--protocol | $STORAGE_STORAGE_ROOT_PROTOCOL
|
||||
: protocol for storage service, can be 'http' or 'grpc'. Default: `grpc`.
|
||||
|
||||
--addr | $STORAGE_STORAGE_ROOT_ADDR
|
||||
: Address to bind storage service. Default: `0.0.0.0:9152`.
|
||||
|
||||
--url | $STORAGE_STORAGE_ROOT_URL
|
||||
: URL to use for the storage service. Default: `localhost:9152`.
|
||||
|
||||
--driver | $STORAGE_STORAGE_ROOT_DRIVER
|
||||
: storage driver for root mount: eg. local, eos, owncloud, ocis or s3. Default: `local`.
|
||||
|
||||
--mount-path | $STORAGE_STORAGE_ROOT_MOUNT_PATH
|
||||
: mount path. Default: `/`.
|
||||
|
||||
--mount-id | $STORAGE_STORAGE_ROOT_MOUNT_ID
|
||||
: mount id. Default: `123e4567-e89b-12d3-a456-426655440001`.
|
||||
|
||||
--expose-data-server | $STORAGE_STORAGE_ROOT_EXPOSE_DATA_SERVER
|
||||
: exposes a dedicated data server.
|
||||
|
||||
--data-server-url | $STORAGE_STORAGE_ROOT_DATA_SERVER_URL
|
||||
: data server url.
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
title: "License"
|
||||
date: 2018-05-02T00:00:00+00:00
|
||||
weight: 40
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: license.md
|
||||
---
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
---
|
||||
title: "Releasing"
|
||||
date: 2020-05-22T00:00:00+00:00
|
||||
weight: 60
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: releasing.md
|
||||
---
|
||||
|
||||
{{< toc >}}
|
||||
|
||||
To release a new version of the storage submodule, you have to follow a few simple steps.
|
||||
|
||||
## Preparation
|
||||
|
||||
1. Before releasing, make sure that reva has been [updated to the desired version]({{< ref "updating.md" >}})
|
||||
|
||||
## Release
|
||||
1. Check out master
|
||||
{{< highlight txt >}}
|
||||
git checkout master
|
||||
git pull origin master
|
||||
{{< / highlight >}}
|
||||
2. Create a new tag (preferably signed) and replace the version number accordingly. Prefix the tag with the submodule `storage/v`.
|
||||
{{< highlight txt >}}
|
||||
git tag -s storage/vx.x.x -m "release vx.x.x"
|
||||
git push origin storage/vx.x.x
|
||||
{{< / highlight >}}
|
||||
5. Wait for CI and check that the GitHub release was published.
|
||||
|
||||
Congratulations, you just released the storage submodule!
|
||||
@@ -2,18 +2,18 @@
|
||||
title: "Storages"
|
||||
date: 2020-04-27T18:46:00+01:00
|
||||
weight: 37
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: storages.md
|
||||
---
|
||||
|
||||
## Storage commands
|
||||
|
||||
`ocis-reva` has multiple storage provider commands to preconfigure different default configurations for the reva *storage provider* service. While you could rerun `ocis-reva storage-oc` multiple times with different flags to get multiple instances we are giving the different commands the necessary default configuration to allow the `ocis` binary to simply start them and not deal with configuration.
|
||||
`storage` has multiple storage provider commands to preconfigure different default configurations for the reva *storage provider* service. While you could rerun `storage storage-oc` multiple times with different flags to get multiple instances we are giving the different commands the necessary default configuration to allow the `ocis` binary to simply start them and not deal with configuration.
|
||||
|
||||
## Storage providers
|
||||
|
||||
To manage the file tree ocis uses reva *storage providers* that are accessing the underlying storage using a *storage driver*. The driver can be used to change the implementation of a storage aspect to better reflect the actual underlying storage capabilities. As an example a move operation on a POSIX filesystem ([theoretically](https://danluu.com/deconstruct-files/)) is an atomic operation. When trying to implement a file tree on top of S3 there is no native move operation that can be used. A naive implementation might fall back on a COPY and DELETE. Some S3 implementations provide a COPY operation that uses an existing key as the source, so the file at least does not need to be reuploaded. In the worst case scenario, which is renaming a folder with hundreds of thousands of objects, a reupload for every file has to be made. Instead of hiding this complexity a better choice might be to disable renaming of files or at least folders on S3. There are however implementations of filesystems on top of S3 that store the tree metadata in dedicated objects or use a completely different persistence mechanism like a distributed key value store to implement the file tree aspect of a storage.
|
||||
To manage the file tree ocis uses storage *storage providers* that are accessing the underlying storage using a *storage driver*. The driver can be used to change the implementation of a storage aspect to better reflect the actual underlying storage capabilities. As an example a move operation on a POSIX filesystem ([theoretically](https://danluu.com/deconstruct-files/)) is an atomic operation. When trying to implement a file tree on top of S3 there is no native move operation that can be used. A naive implementation might fall back on a COPY and DELETE. Some S3 implementations provide a COPY operation that uses an existing key as the source, so the file at least does not need to be reuploaded. In the worst case scenario, which is renaming a folder with hundreds of thousands of objects, a reupload for every file has to be made. Instead of hiding this complexity a better choice might be to disable renaming of files or at least folders on S3. There are however implementations of filesystems on top of S3 that store the tree metadata in dedicated objects or use a completely different persistence mechanism like a distributed key value store to implement the file tree aspect of a storage.
|
||||
|
||||
|
||||
{{< hint info >}}
|
||||
@@ -120,7 +120,7 @@ To provide the other storage aspects we plan to implement a FUSE overlay filesys
|
||||
This is the current default storage driver. While it implements the file tree (using redis, including id based lookup), ETag propagation, trash, versions and sharing (including expiry) using the data directory layout of ownCloud 10 it has [known limitations](https://github.com/owncloud/core/issues/28095) that cannot be fixed without changing the actual layout on disk.
|
||||
|
||||
To setup it up properly in a distributed fashion, the storage-home and the storage-oc need to share the same underlying FS. Their "data" counterparts also need access to the same shared FS.
|
||||
For a simple docker-compose setup, you can create a volume which will be used by the "ocis-reva-storage-home", "ocis-reva-storage-home-data", "ocis-reva-storage-oc" and "ocis-reva-storage-oc-data" containers. Using the `owncloud/ocis-reva` docker image, the volume would need to be hooked in the `/var/tmp/reva` folder insde the containers.
|
||||
For a simple docker-compose setup, you can create a volume which will be used by the "storage-storage-home", "storage-storage-home-data", "storage-storage-oc" and "storage-storage-oc-data" containers. Using the `owncloud/ocis` docker image, the volume would need to be hooked in the `/var/tmp/ocis` folder insde the containers.
|
||||
|
||||
- tree provided by a POSIX filesystem
|
||||
- file layout is mapped to the old ownCloud 10 layout
|
||||
@@ -155,20 +155,20 @@ For a simple docker-compose setup, you can create a volume which will be used by
|
||||
|
||||
### EOS Storage Driver
|
||||
|
||||
The CERN eos storage has evolved with ownCloud and natively supports id based lookup, ETag propagation, subtree size accounting, sharing, trash and versions. To use it you need to change the default configuration of the `ocis-reva storage-home` command (or have a look at the Makefile ̀ eos-start` target):
|
||||
The CERN eos storage has evolved with ownCloud and natively supports id based lookup, ETag propagation, subtree size accounting, sharing, trash and versions. To use it you need to change the default configuration of the `storage storage-home` command (or have a look at the Makefile ̀ eos-start` target):
|
||||
|
||||
```
|
||||
export REVA_STORAGE_HOME_DRIVER=eos
|
||||
export REVA_STORAGE_EOS_NAMESPACE=/eos
|
||||
export REVA_STORAGE_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
|
||||
export REVA_STORAGE_EOS_ENABLE_HOME=true
|
||||
export REVA_STORAGE_EOS_LAYOUT="dockertest/{{.Username}}"
|
||||
export STORAGE_STORAGE_HOME_DRIVER=eos
|
||||
export STORAGE_STORAGE_EOS_NAMESPACE=/eos
|
||||
export STORAGE_STORAGE_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
|
||||
export STORAGE_STORAGE_EOS_ENABLE_HOME=true
|
||||
export STORAGE_STORAGE_EOS_LAYOUT="dockertest/{{.Username}}"
|
||||
```
|
||||
|
||||
Running it locally also requires the `eos` and `xrootd` binaries. Running it using `make eos-start` will use CentOS based containers that already have the necessary packages installed.
|
||||
|
||||
{{< hint info >}}
|
||||
Pull requests to add explicit `reva storage-(s3|custom|...)` commands with working defaults are welcome.
|
||||
Pull requests to add explicit `storage storage-(s3|custom|...)` commands with working defaults are welcome.
|
||||
{{< /hint >}}
|
||||
|
||||
### S3 Storage Driver
|
||||
@@ -177,7 +177,7 @@ A naive driver that treats the keys in an S3 capable storage as `/` delimited pa
|
||||
|
||||
## Data Providers
|
||||
|
||||
Clients using the CS3 API use an [InitiateFileDownload](https://cs3org.github.io/cs3apis/#cs3.storage.provider.v1beta1.InitiateFileDownloadRequest) and ]InitiateUpload](https://cs3org.github.io/cs3apis/#cs3.storage.provider.v1beta1.InitiateFileUploadRequest) request at the [reva gateway](https://cs3org.github.io/cs3apis/#cs3.gateway.v1beta1.GatewayAPI) to obtain a URL endpoint that can be used to either GET the file content or upload content using the resumable [tus.io](https://tus.io) protocol.
|
||||
Clients using the CS3 API use an [InitiateFileDownload](https://cs3org.github.io/cs3apis/#cs3.storage.provider.v1beta1.InitiateFileDownloadRequest) and ]InitiateUpload](https://cs3org.github.io/cs3apis/#cs3.storage.provider.v1beta1.InitiateFileUploadRequest) request at the [storage gateway](https://cs3org.github.io/cs3apis/#cs3.gateway.v1beta1.GatewayAPI) to obtain a URL endpoint that can be used to either GET the file content or upload content using the resumable [tus.io](https://tus.io) protocol.
|
||||
|
||||
The *data provider* uses the same *storage driver* as the *storage provider* but can be scaled independently.
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
title: "Testing"
|
||||
date: 2018-05-02T00:00:00+00:00
|
||||
weight: 37
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: testing.md
|
||||
---
|
||||
|
||||
@@ -41,37 +41,37 @@ File versions need a redis server. Start one with docker by using:
|
||||
|
||||
### Run ocis-reva with that ldap server
|
||||
|
||||
`ocis-reva` provides multiple subcommands. To configure them all via env vars you can export these environment variables.
|
||||
`storage` provides multiple subcommands. To configure them all via env vars you can export these environment variables.
|
||||
|
||||
```
|
||||
export REVA_USERS_DRIVER=ldap
|
||||
export REVA_LDAP_HOSTNAME=localhost
|
||||
export REVA_LDAP_PORT=636
|
||||
export REVA_LDAP_BASE_DN='dc=owncloud,dc=com'
|
||||
export REVA_LDAP_USERFILTER='(&(objectclass=posixAccount)(cn=%s))'
|
||||
export REVA_LDAP_GROUPFILTER='(&(objectclass=posixGroup)(cn=%s))'
|
||||
export REVA_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com'
|
||||
export REVA_LDAP_BIND_PASSWORD=admin
|
||||
export REVA_LDAP_SCHEMA_UID=uid
|
||||
export REVA_LDAP_SCHEMA_MAIL=mail
|
||||
export REVA_LDAP_SCHEMA_DISPLAYNAME=displayName
|
||||
export REVA_LDAP_SCHEMA_CN=cn
|
||||
export REVA_FRONTEND_URL=http://localhost:9140 # needed because the proxy is not started
|
||||
export REVA_DATAGATEWAY_URL=http://localhost:9140/data # needed because the proxy is not started
|
||||
export STORAGE_USERS_DRIVER=ldap
|
||||
export STORAGE_LDAP_HOSTNAME=localhost
|
||||
export STORAGE_LDAP_PORT=636
|
||||
export STORAGE_LDAP_BASE_DN='dc=owncloud,dc=com'
|
||||
export STORAGE_LDAP_USERFILTER='(&(objectclass=posixAccount)(cn=%s))'
|
||||
export STORAGE_LDAP_GROUPFILTER='(&(objectclass=posixGroup)(cn=%s))'
|
||||
export STORAGE_LDAP_BIND_DN='cn=admin,dc=owncloud,dc=com'
|
||||
export STORAGE_LDAP_BIND_PASSWORD=admin
|
||||
export STORAGE_LDAP_SCHEMA_UID=uid
|
||||
export STORAGE_LDAP_SCHEMA_MAIL=mail
|
||||
export STORAGE_LDAP_SCHEMA_DISPLAYNAME=displayName
|
||||
export STORAGE_LDAP_SCHEMA_CN=cn
|
||||
export STORAGE_FRONTEND_URL=http://localhost:9140 # needed because the proxy is not started
|
||||
export STORAGE_DATAGATEWAY_URL=http://localhost:9140/data # needed because the proxy is not started
|
||||
```
|
||||
|
||||
Then you need to start the ocis-reva services
|
||||
```
|
||||
bin/ocis-reva frontend & \
|
||||
bin/ocis-reva gateway & \
|
||||
bin/ocis-reva auth-basic & \
|
||||
bin/ocis-reva auth-bearer & \
|
||||
bin/ocis-reva sharing & \
|
||||
bin/ocis-reva storage-home & \
|
||||
bin/ocis-reva storage-home-data & \
|
||||
bin/ocis-reva storage-oc & \
|
||||
bin/ocis-reva storage-oc-data & \
|
||||
bin/ocis-reva users &
|
||||
bin/storage frontend & \
|
||||
bin/storage gateway & \
|
||||
bin/storage auth-basic & \
|
||||
bin/storage auth-bearer & \
|
||||
bin/storage sharing & \
|
||||
bin/storage storage-home & \
|
||||
bin/storage storage-home-data & \
|
||||
bin/storage storage-oc & \
|
||||
bin/storage storage-oc-data & \
|
||||
bin/storage users &
|
||||
```
|
||||
|
||||
### Run the API acceptance tests
|
||||
@@ -141,7 +141,7 @@ If you want to work on a specific issue
|
||||
9. make a PR that has the fixed code, relevant lines removed from the expected failures file and bug demonstration tests deleted.
|
||||
|
||||
If the changes also affect the `ocis` repository make sure the changes get ported over there.
|
||||
That will need the fixed code in `ocis-reva` to be applied to `ocis` along with the test-related changes.
|
||||
That will need the fixed code in `storage` to be applied to `ocis` along with the test-related changes.
|
||||
|
||||
### Notes
|
||||
- in a normal case the test-code cleans up users after the test-run, but if a test-run is interrupted (e.g. by CTRL+C) users might have been left on the LDAP server. In that case rerunning the tests requires wiping the users in the ldap server, otherwise the tests will fail when trying to populate the users. This can be done by simply running `docker stop docker-slapd && docker rm docker-slapd` and [restarting the LDAP server container](#run-a-ldap-server-in-a-docker-container)
|
||||
@@ -2,8 +2,8 @@
|
||||
title: "Updating reva"
|
||||
date: 2020-05-22T00:00:00+00:00
|
||||
weight: 50
|
||||
geekdocRepo: https://github.com/owncloud/ocis-reva
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: updating.md
|
||||
---
|
||||
|
||||
@@ -15,5 +15,5 @@ geekdocFilePath: updating.md
|
||||
2. Create a changelog entry containing changes that were done in [reva](https://github.com/cs3org/reva/commits/master)
|
||||
3. Create a Pull Request to ocis-reva master with those changes
|
||||
4. If test issues appear, you might need to [adjust the tests]({{< ref "testing.md" >}})
|
||||
5. After the PR is merged, consider doing a [release of ocis-reva]({{< ref "releasing.md" >}})
|
||||
5. After the PR is merged, consider doing a [release of the storage submodule]({{< ref "releasing.md" >}})
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
---
|
||||
title: "Users"
|
||||
date: 2020-01-16T00:00:00+00:00
|
||||
weight: 35
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs/extensions/storage
|
||||
geekdocFilePath: users.md
|
||||
---
|
||||
|
||||
### Demo driver
|
||||
|
||||
This is a simple user driver for testing. It contains three users:
|
||||
```
|
||||
einstein:relativity
|
||||
marie:radioactivty
|
||||
richard:superfluidity
|
||||
```
|
||||
In order to use the `demo` driver you need to export the relevant environment variable:
|
||||
```
|
||||
export STORAGE_USERS_DRIVER=demo
|
||||
```
|
||||
|
||||
### JSON driver
|
||||
|
||||
In order to switch from the `ldap` driver to JSON based users you need to export the relevant environment variables:
|
||||
```
|
||||
export STORAGE_USERS_DRIVER=json
|
||||
export STORAGE_USERS_JSON=/path/to/users.json
|
||||
```
|
||||
|
||||
For the format of the users.json have a look at the [reva examples](https://github.com/cs3org/reva/blob/master/examples/separate/users.demo.json)
|
||||
|
||||
### LDAP driver
|
||||
|
||||
This is the default user driver.
|
||||
|
||||
If the below defaults don't match your environment change them accordingly:
|
||||
```
|
||||
export STORAGE_LDAP_HOSTNAME=localhost
|
||||
export STORAGE_LDAP_PORT=9126
|
||||
export STORAGE_LDAP_BASE_DN='dc=example,dc=org'
|
||||
export STORAGE_LDAP_USERFILTER='(&(objectclass=posixAccount)(cn=%s))'
|
||||
export STORAGE_LDAP_GROUPFILTER='(&(objectclass=posixGroup)(cn=%s))'
|
||||
export STORAGE_LDAP_BIND_DN='cn=reva,ou=sysusers,dc=example,dc=org'
|
||||
export STORAGE_LDAP_BIND_PASSWORD=reva
|
||||
export STORAGE_LDAP_SCHEMA_UID=uid
|
||||
export STORAGE_LDAP_SCHEMA_MAIL=mail
|
||||
export STORAGE_LDAP_SCHEMA_DISPLAYNAME=sn
|
||||
export STORAGE_LDAP_SCHEMA_CN=cn
|
||||
```
|
||||
|
||||
Then restart the `bin/storage users` and `bin/storage auth-basic` services for the changes to take effect.
|
||||
+120
-110
@@ -1,9 +1,9 @@
|
||||
---
|
||||
title: "Configuration"
|
||||
date: "2020-09-21T13:14:56+0200"
|
||||
date: "2020-10-05T21:19:39+0200"
|
||||
weight: 20
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocEditPath: edit/master/docs/ocis
|
||||
geekdocFilePath: configuration.md
|
||||
---
|
||||
|
||||
@@ -43,28 +43,25 @@ ownCloud Infinite Scale Stack
|
||||
|
||||
Usage: `ocis [global options] command [command options] [arguments...]`
|
||||
|
||||
--config-file | $OCIS_CONFIG_FILE
|
||||
--config-file | $OCIS_CONFIG_FILE
|
||||
: Path to config file.
|
||||
|
||||
--log-level | $OCIS_LOG_LEVEL
|
||||
--log-level | $OCIS_LOG_LEVEL
|
||||
: Set logging level. Default: `info`.
|
||||
|
||||
--log-pretty | $OCIS_LOG_PRETTY
|
||||
--log-pretty | $OCIS_LOG_PRETTY
|
||||
: Enable pretty logging. Default: `true`.
|
||||
|
||||
--log-color | $OCIS_LOG_COLOR
|
||||
--log-color | $OCIS_LOG_COLOR
|
||||
: Enable colored logging. Default: `true`.
|
||||
|
||||
## Sub Commands
|
||||
|
||||
### ocis health
|
||||
### ocis kill
|
||||
|
||||
Check health status
|
||||
Kill an extension by name
|
||||
|
||||
Usage: `ocis health [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $OCIS_DEBUG_ADDR
|
||||
: Address to debug endpoint. Default: `0.0.0.0:9010`.
|
||||
Usage: `ocis kill [command options] [arguments...]`
|
||||
|
||||
### ocis server
|
||||
|
||||
@@ -72,42 +69,63 @@ Start fullstack server
|
||||
|
||||
Usage: `ocis server [command options] [arguments...]`
|
||||
|
||||
--tracing-enabled | $OCIS_TRACING_ENABLED
|
||||
--tracing-enabled | $OCIS_TRACING_ENABLED
|
||||
: Enable sending traces.
|
||||
|
||||
--tracing-type | $OCIS_TRACING_TYPE
|
||||
--tracing-type | $OCIS_TRACING_TYPE
|
||||
: Tracing backend type. Default: `jaeger`.
|
||||
|
||||
--tracing-endpoint | $OCIS_TRACING_ENDPOINT
|
||||
--tracing-endpoint | $OCIS_TRACING_ENDPOINT
|
||||
: Endpoint for the agent. Default: `localhost:6831`.
|
||||
|
||||
--tracing-collector | $OCIS_TRACING_COLLECTOR
|
||||
--tracing-collector | $OCIS_TRACING_COLLECTOR
|
||||
: Endpoint for the collector. Default: `http://localhost:14268/api/traces`.
|
||||
|
||||
--tracing-service | $OCIS_TRACING_SERVICE
|
||||
--tracing-service | $OCIS_TRACING_SERVICE
|
||||
: Service name for tracing. Default: `ocis`.
|
||||
|
||||
--debug-addr | $OCIS_DEBUG_ADDR
|
||||
--debug-addr | $OCIS_DEBUG_ADDR
|
||||
: Address to bind debug server. Default: `0.0.0.0:9010`.
|
||||
|
||||
--debug-token | $OCIS_DEBUG_TOKEN
|
||||
--debug-token | $OCIS_DEBUG_TOKEN
|
||||
: Token to grant metrics access.
|
||||
|
||||
--debug-pprof | $OCIS_DEBUG_PPROF
|
||||
--debug-pprof | $OCIS_DEBUG_PPROF
|
||||
: Enable pprof debugging.
|
||||
|
||||
--debug-zpages | $OCIS_DEBUG_ZPAGES
|
||||
--debug-zpages | $OCIS_DEBUG_ZPAGES
|
||||
: Enable zpages debugging.
|
||||
|
||||
--http-addr | $OCIS_HTTP_ADDR
|
||||
--http-addr | $OCIS_HTTP_ADDR
|
||||
: Address to bind http server. Default: `0.0.0.0:9000`.
|
||||
|
||||
--http-root | $OCIS_HTTP_ROOT
|
||||
--http-root | $OCIS_HTTP_ROOT
|
||||
: Root path of http server. Default: `/`.
|
||||
|
||||
--grpc-addr | $OCIS_GRPC_ADDR
|
||||
--grpc-addr | $OCIS_GRPC_ADDR
|
||||
: Address to bind grpc server. Default: `0.0.0.0:9001`.
|
||||
|
||||
### ocis run
|
||||
|
||||
Runs an extension
|
||||
|
||||
Usage: `ocis run [command options] [arguments...]`
|
||||
|
||||
### ocis health
|
||||
|
||||
Check health status
|
||||
|
||||
Usage: `ocis health [command options] [arguments...]`
|
||||
|
||||
--debug-addr | $OCIS_DEBUG_ADDR
|
||||
: Address to debug endpoint. Default: `0.0.0.0:9010`.
|
||||
|
||||
### ocis list
|
||||
|
||||
Lists running ocis extensions
|
||||
|
||||
Usage: `ocis list [command options] [arguments...]`
|
||||
|
||||
### List of available Extension subcommands
|
||||
|
||||
There are more subcommands to start the individual extensions. Please check the documentation about their usage and options in the dedicated section of the documentation.
|
||||
@@ -116,9 +134,29 @@ There are more subcommands to start the individual extensions. Please check the
|
||||
|
||||
Start konnectd server
|
||||
|
||||
#### ocis run
|
||||
#### ocis storage-frontend
|
||||
|
||||
Runs an extension
|
||||
Start storage frontend
|
||||
|
||||
#### ocis accounts
|
||||
|
||||
Start accounts server
|
||||
|
||||
#### ocis storage-storage-root
|
||||
|
||||
Start storage root storage
|
||||
|
||||
#### ocis storage-gateway
|
||||
|
||||
Start storage gateway
|
||||
|
||||
#### ocis storage-storage-home
|
||||
|
||||
Start storage storage service for home mount
|
||||
|
||||
#### ocis storage-storage-public-link
|
||||
|
||||
Start storage public link storage
|
||||
|
||||
#### ocis store
|
||||
|
||||
@@ -128,95 +166,67 @@ Start a go-micro store
|
||||
|
||||
Start glauth server
|
||||
|
||||
#### ocis ocs
|
||||
#### ocis storage-auth-bearer
|
||||
|
||||
Start ocs server
|
||||
Start storage auth-bearer service
|
||||
|
||||
#### ocis reva-storage-eos-data
|
||||
#### ocis storage-sharing
|
||||
|
||||
Start reva storage data provider for eos mount
|
||||
|
||||
#### ocis reva-storage-home-data
|
||||
|
||||
Start reva storage data provider for home mount
|
||||
|
||||
#### ocis kill
|
||||
|
||||
Kill an extension by name
|
||||
|
||||
#### ocis proxy
|
||||
|
||||
Start proxy server
|
||||
|
||||
#### ocis reva-auth-bearer
|
||||
|
||||
Start reva auth-bearer service
|
||||
|
||||
#### ocis reva-storage-oc-data
|
||||
|
||||
Start reva storage data provider for oc mount
|
||||
|
||||
#### ocis settings
|
||||
|
||||
Start settings server
|
||||
|
||||
#### ocis accounts
|
||||
|
||||
Start accounts server
|
||||
|
||||
#### ocis phoenix
|
||||
|
||||
Start phoenix server
|
||||
|
||||
#### ocis reva-storage-eos
|
||||
|
||||
Start reva storage service for eos mount
|
||||
|
||||
#### ocis reva-storage-home
|
||||
|
||||
Start reva storage service for home mount
|
||||
|
||||
#### ocis reva-storage-oc
|
||||
|
||||
Start reva storage service for oc mount
|
||||
|
||||
#### ocis reva-storage-root
|
||||
|
||||
Start reva root storage
|
||||
|
||||
#### ocis reva-gateway
|
||||
|
||||
Start reva gateway
|
||||
|
||||
#### ocis reva-sharing
|
||||
|
||||
Start reva sharing service
|
||||
|
||||
#### ocis reva-users
|
||||
|
||||
Start reva users service
|
||||
|
||||
#### ocis list
|
||||
|
||||
Lists running ocis extensions
|
||||
|
||||
#### ocis reva-auth-basic
|
||||
|
||||
Start reva auth-basic service
|
||||
|
||||
#### ocis reva-frontend
|
||||
|
||||
Start reva frontend
|
||||
|
||||
#### ocis reva-storage-public-link
|
||||
|
||||
Start reva public link storage
|
||||
|
||||
#### ocis thumbnails
|
||||
|
||||
Start thumbnails server
|
||||
Start storage sharing service
|
||||
|
||||
#### ocis webdav
|
||||
|
||||
Start webdav server
|
||||
|
||||
#### ocis storage-storage-oc-data
|
||||
|
||||
Start storage storage data provider for oc mount
|
||||
|
||||
#### ocis thumbnails
|
||||
|
||||
Start thumbnails server
|
||||
|
||||
#### ocis proxy
|
||||
|
||||
Start proxy server
|
||||
|
||||
#### ocis settings
|
||||
|
||||
Start settings server
|
||||
|
||||
#### ocis storage-auth-basic
|
||||
|
||||
Start storage auth-basic service
|
||||
|
||||
#### ocis storage-storage-metadata
|
||||
|
||||
Start storage storage service for metadata mount
|
||||
|
||||
#### ocis ocs
|
||||
|
||||
Start ocs server
|
||||
|
||||
#### ocis storage-storage-eos
|
||||
|
||||
Start storage storage service for eos mount
|
||||
|
||||
#### ocis storage-storage-eos-data
|
||||
|
||||
Start storage storage data provider for eos mount
|
||||
|
||||
#### ocis storage-storage-home-data
|
||||
|
||||
Start storage storage data provider for home mount
|
||||
|
||||
#### ocis storage-storage-oc
|
||||
|
||||
Start storage storage service for oc mount
|
||||
|
||||
#### ocis storage-users
|
||||
|
||||
Start storage users service
|
||||
|
||||
#### ocis phoenix
|
||||
|
||||
Start phoenix server
|
||||
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ require (
|
||||
github.com/owncloud/ocis/konnectd v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/ocis-phoenix v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/ocis-pkg v0.1.0
|
||||
github.com/owncloud/ocis/ocis-reva v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/storage v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/ocs v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/proxy v0.0.0-00010101000000-000000000000
|
||||
github.com/owncloud/ocis/settings v0.0.0-20200918114005-1a0ddd2190ee
|
||||
@@ -40,7 +40,7 @@ replace (
|
||||
github.com/owncloud/ocis/konnectd => ../konnectd
|
||||
github.com/owncloud/ocis/ocis-phoenix => ../ocis-phoenix
|
||||
github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
|
||||
github.com/owncloud/ocis/ocis-reva => ../ocis-reva
|
||||
github.com/owncloud/ocis/storage => ../storage
|
||||
github.com/owncloud/ocis/ocs => ../ocs
|
||||
github.com/owncloud/ocis/proxy => ../proxy
|
||||
github.com/owncloud/ocis/settings => ../settings
|
||||
|
||||
@@ -868,6 +868,7 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI
|
||||
github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
|
||||
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
|
||||
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
|
||||
github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A=
|
||||
github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM=
|
||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
|
||||
@@ -48,8 +48,8 @@ func configureProxy(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Proxy.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
if cfg.Reva.Reva.JWTSecret != "" {
|
||||
cfg.Proxy.TokenManager.JWTSecret = cfg.Reva.Reva.JWTSecret
|
||||
if cfg.Storage.Reva.JWTSecret != "" {
|
||||
cfg.Proxy.TokenManager.JWTSecret = cfg.Storage.Reva.JWTSecret
|
||||
}
|
||||
|
||||
return cfg.Proxy
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaAuthBasicCommand is the entrypoint for the reva-auth-basic command.
|
||||
func RevaAuthBasicCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-auth-basic",
|
||||
Usage: "Start reva auth-basic service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.AuthBasicWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaAuthBasic(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.AuthBasic(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaAuthBasic(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaAuthBasicCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaAuthBearerCommand is the entrypoint for the reva-auth-bearer command.
|
||||
func RevaAuthBearerCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-auth-bearer",
|
||||
Usage: "Start reva auth-bearer service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.AuthBearerWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaAuthBearer(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.AuthBearer(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaAuthBearer(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaAuthBearerCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaFrontendCommand is the entrypoint for the reva-frontend command.
|
||||
func RevaFrontendCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-frontend",
|
||||
Usage: "Start reva frontend",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.FrontendWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaFrontend(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Frontend(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaFrontend(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaFrontendCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaGatewayCommand is the entrypoint for the reva-gateway command.
|
||||
func RevaGatewayCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-gateway",
|
||||
Usage: "Start reva gateway",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.GatewayWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaGateway(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Gateway(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaGateway(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaGatewayCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaSharingCommand is the entrypoint for the reva-sharing command.
|
||||
func RevaSharingCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-sharing",
|
||||
Usage: "Start reva sharing service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.SharingWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaSharing(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Sharing(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaSharing(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaSharingCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageEOSCommand is the entrypoint for the reva-storage-oc command.
|
||||
func RevaStorageEOSCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-eos",
|
||||
Usage: "Start reva storage service for eos mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageEOSWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageEOS(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageEOS(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageEOS(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageEOSCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageEOSDataCommand is the entrypoint for the reva-storage-eos-data command.
|
||||
func RevaStorageEOSDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-eos-data",
|
||||
Usage: "Start reva storage data provider for eos mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageEOSDataWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageEOSData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageEOSData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageEOSData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageEOSDataCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageHomeCommand is the entrypoint for the reva-storage-home command.
|
||||
func RevaStorageHomeCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-home",
|
||||
Usage: "Start reva storage service for home mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageHomeWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageHome(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageHome(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageHome(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageHomeCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageHomeDataCommand is the entrypoint for the reva-storage-home-data command.
|
||||
func RevaStorageHomeDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-home-data",
|
||||
Usage: "Start reva storage data provider for home mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageHomeDataWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageHomeData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageHomeData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageHomeData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageHomeDataCommand)
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageMetadataCommand is the entrypoint for the reva-storage-metadata command.
|
||||
func RevaStorageMetadataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-metadata",
|
||||
Usage: "Start reva storage service for metadata mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageMetadata(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
revaStorageMetadataCommand := command.StorageMetadata(configureRevaStorageMetadata(cfg))
|
||||
|
||||
if err := revaStorageMetadataCommand.Before(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return cli.HandleAction(revaStorageMetadataCommand.Action, c)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageMetadata(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageMetadataCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageOCCommand is the entrypoint for the reva-storage-oc command.
|
||||
func RevaStorageOCCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-oc",
|
||||
Usage: "Start reva storage service for oc mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageOCWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageOC(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageOC(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageOC(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageOCCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageOCDataCommand is the entrypoint for the reva-storage-oc-data command.
|
||||
func RevaStorageOCDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-oc-data",
|
||||
Usage: "Start reva storage data provider for oc mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageOCDataWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageOCData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageOCData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageOCData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageOCDataCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStoragePublicLinkCommand is the entrypoint for the reva-storage-oc command.
|
||||
func RevaStoragePublicLinkCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-public-link",
|
||||
Usage: "Start reva public link storage",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StoragePublicLink(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStoragePublicLink(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StoragePublicLink(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStoragePublicLink(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStoragePublicLinkCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaStorageRootCommand is the entrypoint for the reva-storage-root command.
|
||||
func RevaStorageRootCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-storage-root",
|
||||
Usage: "Start reva root storage",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageRootWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaStorageRoot(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageRoot(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaStorageRoot(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaStorageRootCommand)
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// RevaUsersCommand is the entrypoint for the reva-users command.
|
||||
func RevaUsersCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "reva-users",
|
||||
Usage: "Start reva users service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.UsersWithConfig(cfg.Reva),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureRevaUsers(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Users(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureRevaUsers(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Reva.Log.Level = cfg.Log.Level
|
||||
cfg.Reva.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Reva.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Reva.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Reva.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Reva.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Reva.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Reva.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Reva
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(RevaUsersCommand)
|
||||
}
|
||||
@@ -4,12 +4,12 @@ package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/owncloud/ocis/ocis/pkg/version"
|
||||
"github.com/owncloud/ocis/settings/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// SettingsCommand is the entry point for the settings command.
|
||||
@@ -48,8 +48,8 @@ func configureSettings(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Settings.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
if cfg.Reva.Reva.JWTSecret != "" {
|
||||
cfg.Settings.TokenManager.JWTSecret = cfg.Reva.Reva.JWTSecret
|
||||
if cfg.Storage.Reva.JWTSecret != "" {
|
||||
cfg.Settings.TokenManager.JWTSecret = cfg.Storage.Reva.JWTSecret
|
||||
}
|
||||
|
||||
return cfg.Settings
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
)
|
||||
|
||||
// StorageAuthBasicCommand is the entrypoint for the reva-auth-basic command.
|
||||
func StorageAuthBasicCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-auth-basic",
|
||||
Usage: "Start storage auth-basic service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.AuthBasicWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageAuthBasic(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.AuthBasic(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageAuthBasic(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageAuthBasicCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageAuthBearerCommand is the entrypoint for the reva-auth-bearer command.
|
||||
func StorageAuthBearerCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-auth-bearer",
|
||||
Usage: "Start storage auth-bearer service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.AuthBearerWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageAuthBearer(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.AuthBearer(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageAuthBearer(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageAuthBearerCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageFrontendCommand is the entrypoint for the reva-frontend command.
|
||||
func StorageFrontendCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-frontend",
|
||||
Usage: "Start storage frontend",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.FrontendWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageFrontend(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Frontend(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageFrontend(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageFrontendCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageGatewayCommand is the entrypoint for the reva-gateway command.
|
||||
func StorageGatewayCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-gateway",
|
||||
Usage: "Start storage gateway",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.GatewayWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageGateway(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Gateway(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageGateway(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageGatewayCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageSharingCommand is the entrypoint for the reva-sharing command.
|
||||
func StorageSharingCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-sharing",
|
||||
Usage: "Start storage sharing service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.SharingWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageSharing(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Sharing(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageSharing(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageSharingCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
)
|
||||
|
||||
// StorageStorageEOSCommand is the entrypoint for the reva-storage-oc command.
|
||||
func StorageStorageEOSCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-eos",
|
||||
Usage: "Start storage storage service for eos mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageEOSWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageEOS(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageEOS(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageEOS(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageEOSCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageEOSDataCommand is the entrypoint for the reva-storage-eos-data command.
|
||||
func StorageStorageEOSDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-eos-data",
|
||||
Usage: "Start storage storage data provider for eos mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageEOSDataWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageEOSData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageEOSData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageEOSData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageEOSDataCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageHomeCommand is the entrypoint for the reva-storage-home command.
|
||||
func StorageStorageHomeCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-home",
|
||||
Usage: "Start storage storage service for home mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageHomeWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageHome(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageHome(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageHome(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageHomeCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageHomeDataCommand is the entrypoint for the reva-storage-home-data command.
|
||||
func StorageStorageHomeDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-home-data",
|
||||
Usage: "Start storage storage data provider for home mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageHomeDataWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageHomeData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageHomeData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageHomeData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageHomeDataCommand)
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageMetadataCommand is the entrypoint for the reva-storage-metadata command.
|
||||
func StorageStorageMetadataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-metadata",
|
||||
Usage: "Start storage storage service for metadata mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageMetadata(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
revaStorageMetadataCommand := command.StorageMetadata(configureStorageStorageMetadata(cfg))
|
||||
|
||||
if err := revaStorageMetadataCommand.Before(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return cli.HandleAction(revaStorageMetadataCommand.Action, c)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageMetadata(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageMetadataCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageOCCommand is the entrypoint for the reva-storage-oc command.
|
||||
func StorageStorageOCCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-oc",
|
||||
Usage: "Start storage storage service for oc mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageOCWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageOC(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageOC(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageOC(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageOCCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageOCDataCommand is the entrypoint for the reva-storage-oc-data command.
|
||||
func StorageStorageOCDataCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-oc-data",
|
||||
Usage: "Start storage storage data provider for oc mount",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageOCDataWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageOCData(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageOCData(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageOCData(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageOCDataCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStoragePublicLinkCommand is the entrypoint for the reva-storage-oc command.
|
||||
func StorageStoragePublicLinkCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-public-link",
|
||||
Usage: "Start storage public link storage",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StoragePublicLink(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStoragePublicLink(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StoragePublicLink(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStoragePublicLink(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStoragePublicLinkCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageStorageRootCommand is the entrypoint for the reva-storage-root command.
|
||||
func StorageStorageRootCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-storage-root",
|
||||
Usage: "Start storage root storage",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.StorageRootWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageStorageRoot(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.StorageRoot(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageStorageRoot(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageStorageRootCommand)
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/storage/pkg/command"
|
||||
svcconfig "github.com/owncloud/ocis/storage/pkg/config"
|
||||
"github.com/owncloud/ocis/storage/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
)
|
||||
|
||||
// StorageUsersCommand is the entrypoint for the reva-users command.
|
||||
func StorageUsersCommand(cfg *config.Config) *cli.Command {
|
||||
return &cli.Command{
|
||||
Name: "storage-users",
|
||||
Usage: "Start storage users service",
|
||||
Category: "Extensions",
|
||||
Flags: flagset.UsersWithConfig(cfg.Storage),
|
||||
Action: func(c *cli.Context) error {
|
||||
scfg := configureStorageUsers(cfg)
|
||||
|
||||
return cli.HandleAction(
|
||||
command.Users(scfg).Action,
|
||||
c,
|
||||
)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func configureStorageUsers(cfg *config.Config) *svcconfig.Config {
|
||||
cfg.Storage.Log.Level = cfg.Log.Level
|
||||
cfg.Storage.Log.Pretty = cfg.Log.Pretty
|
||||
cfg.Storage.Log.Color = cfg.Log.Color
|
||||
|
||||
if cfg.Tracing.Enabled {
|
||||
cfg.Storage.Tracing.Enabled = cfg.Tracing.Enabled
|
||||
cfg.Storage.Tracing.Type = cfg.Tracing.Type
|
||||
cfg.Storage.Tracing.Endpoint = cfg.Tracing.Endpoint
|
||||
cfg.Storage.Tracing.Collector = cfg.Tracing.Collector
|
||||
cfg.Storage.Tracing.Service = cfg.Tracing.Service
|
||||
}
|
||||
|
||||
return cfg.Storage
|
||||
}
|
||||
|
||||
func init() {
|
||||
register.AddCommand(StorageUsersCommand)
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
accounts "github.com/owncloud/ocis/accounts/pkg/config"
|
||||
glauth "github.com/owncloud/ocis/glauth/pkg/config"
|
||||
graphExplorer "github.com/owncloud/ocis-graph-explorer/pkg/config"
|
||||
graph "github.com/owncloud/ocis-graph/pkg/config"
|
||||
hello "github.com/owncloud/ocis-hello/pkg/config"
|
||||
accounts "github.com/owncloud/ocis/accounts/pkg/config"
|
||||
glauth "github.com/owncloud/ocis/glauth/pkg/config"
|
||||
konnectd "github.com/owncloud/ocis/konnectd/pkg/config"
|
||||
ocs "github.com/owncloud/ocis/ocs/pkg/config"
|
||||
phoenix "github.com/owncloud/ocis/ocis-phoenix/pkg/config"
|
||||
ocs "github.com/owncloud/ocis/ocs/pkg/config"
|
||||
proxy "github.com/owncloud/ocis/proxy/pkg/config"
|
||||
reva "github.com/owncloud/ocis/ocis-reva/pkg/config"
|
||||
settings "github.com/owncloud/ocis/settings/pkg/config"
|
||||
storage "github.com/owncloud/ocis/storage/pkg/config"
|
||||
store "github.com/owncloud/ocis/store/pkg/config"
|
||||
thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config"
|
||||
webdav "github.com/owncloud/ocis/webdav/pkg/config"
|
||||
@@ -71,7 +71,7 @@ type Config struct {
|
||||
OCS *ocs.Config
|
||||
Phoenix *phoenix.Config
|
||||
Proxy *proxy.Config
|
||||
Reva *reva.Config
|
||||
Storage *storage.Config
|
||||
Thumbnails *thumbnails.Config
|
||||
WebDAV *webdav.Config
|
||||
Settings *settings.Config
|
||||
@@ -90,7 +90,7 @@ func New() *Config {
|
||||
OCS: ocs.New(),
|
||||
Phoenix: phoenix.New(),
|
||||
WebDAV: webdav.New(),
|
||||
Reva: reva.New(),
|
||||
Storage: storage.New(),
|
||||
GLAuth: glauth.New(),
|
||||
Proxy: proxy.New(),
|
||||
Thumbnails: thumbnails.New(),
|
||||
|
||||
+14
-14
@@ -38,19 +38,19 @@ var (
|
||||
"graph-explorer",
|
||||
"ocs",
|
||||
"webdav",
|
||||
"reva-frontend",
|
||||
"reva-gateway",
|
||||
"reva-users",
|
||||
"reva-auth-basic",
|
||||
"reva-auth-bearer",
|
||||
"reva-storage-home",
|
||||
"reva-storage-home-data",
|
||||
"reva-storage-eos",
|
||||
"reva-storage-eos-data",
|
||||
"reva-storage-oc",
|
||||
"reva-storage-oc-data",
|
||||
"reva-storage-public-link",
|
||||
"reva-storage-metadata",
|
||||
"storage-frontend",
|
||||
"storage-gateway",
|
||||
"storage-users",
|
||||
"storage-auth-basic",
|
||||
"storage-auth-bearer",
|
||||
"storage-storage-home",
|
||||
"storage-storage-home-data",
|
||||
"storage-storage-eos",
|
||||
"storage-storage-eos-data",
|
||||
"storage-storage-oc",
|
||||
"storage-storage-oc-data",
|
||||
"storage-storage-public-link",
|
||||
"storage-storage-metadata",
|
||||
"glauth",
|
||||
"konnectd",
|
||||
"thumbnails",
|
||||
@@ -59,7 +59,7 @@ var (
|
||||
// There seem to be a race condition when reva-sharing needs to read the sharing.json file and the parent folder is not present.
|
||||
dependants = []string{
|
||||
"accounts",
|
||||
"reva-sharing",
|
||||
"storage-sharing",
|
||||
}
|
||||
|
||||
// Maximum number of retries until getting a connection to the rpc runtime service.
|
||||
|
||||
@@ -3,7 +3,7 @@ title: "Configuration"
|
||||
date: "{{ date "2006-01-02T15:04:05-0700" now }}"
|
||||
weight: 20
|
||||
geekdocRepo: https://github.com/owncloud/ocis
|
||||
geekdocEditPath: edit/master/docs
|
||||
geekdocEditPath: edit/master/docs/ocis
|
||||
geekdocFilePath: configuration.md
|
||||
---
|
||||
{{- define "options"}}
|
||||
@@ -11,7 +11,7 @@ geekdocFilePath: configuration.md
|
||||
{{ range $opt := first . }}{{ with list $fnName $opt -}}
|
||||
{{ $o := last . -}}
|
||||
{{ if eq $o.FnName $fnName -}}
|
||||
--{{ $o.Name }} | ${{ index $o.Env 0 }}
|
||||
--{{ $o.Name }} | ${{ index $o.Env 0 }}
|
||||
: {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }}
|
||||
|
||||
{{ end -}}
|
||||
@@ -66,7 +66,7 @@ Usage: `ocis [global options] command [command options] [arguments...]`
|
||||
{{ end -}}
|
||||
{{- range $com := .Commands }}{{ with (list $options $com) -}}
|
||||
{{- $c := last . }}
|
||||
{{- if eq $c.Name "server" "health" -}}
|
||||
{{- if eq $c.Name "server" "health" "kill" "list" "run" -}}
|
||||
{{- if ne $c.FnName "Simple" -}}
|
||||
### ocis {{ $c.Name }}
|
||||
|
||||
@@ -84,11 +84,11 @@ Usage: `ocis {{ $c.Name }} [command options] [arguments...]`
|
||||
There are more subcommands to start the individual extensions. Please check the documentation about their usage and options in the dedicated section of the documentation.
|
||||
|
||||
{{ range $com := .Commands }}{{ with $com -}}
|
||||
{{ if and (ne .Name "health") (ne .Name "server") (ne .Name "ocis") -}}
|
||||
{{ if and (ne .Name "health") (ne .Name "server") (ne .Name "ocis") (ne .Name "kill") (ne .Name "list") (ne .Name "run") -}}
|
||||
#### ocis {{ .Name }}
|
||||
|
||||
{{ .Usage }}
|
||||
|
||||
{{ end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
SHELL := bash
|
||||
NAME := ocis-reva
|
||||
NAME := storage
|
||||
IMPORT := github.com/owncloud/ocis/$(NAME)
|
||||
BIN := bin
|
||||
DIST := dist
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user