mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-05-06 03:20:15 -05:00
Merge branch 'master' into ocis-697
This commit is contained in:
A.Unger
+5
-5
@@ -15,12 +15,12 @@ config = {
|
||||
},
|
||||
'apiTests': {
|
||||
'coreBranch': 'master',
|
||||
'coreCommit': '47365d22af95d90fcbd7705572f715a7b93d31b6',
|
||||
'coreCommit': '8fee3047cadfaae5a4cee330a102af8d1ada8160',
|
||||
'numberOfParts': 6
|
||||
},
|
||||
'uiTests': {
|
||||
'phoenixBranch': 'master',
|
||||
'phoenixCommit': 'f427a438e12a23e7a32f7864763787e756287461',
|
||||
'phoenixCommit': '492e6a663efad67f770ba4ac405c4d9983d00cd3',
|
||||
'suites': {
|
||||
'phoenixWebUI1': [
|
||||
'webUICreateFilesFolders',
|
||||
@@ -352,7 +352,7 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo
|
||||
cloneCoreRepos(coreBranch, coreCommit) + [
|
||||
{
|
||||
'name': 'localApiTests-%s-storage' % (storage),
|
||||
'image': 'owncloudci/php:7.2',
|
||||
'image': 'owncloudci/php:7.4',
|
||||
'pull': 'always',
|
||||
'environment' : {
|
||||
'TEST_SERVER_URL': 'https://ocis-server:9200',
|
||||
@@ -407,7 +407,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
|
||||
cloneCoreRepos(coreBranch, coreCommit) + [
|
||||
{
|
||||
'name': 'oC10ApiTests-%s-storage-%s' % (storage, part_number),
|
||||
'image': 'owncloudci/php:7.2',
|
||||
'image': 'owncloudci/php:7.4',
|
||||
'pull': 'always',
|
||||
'environment' : {
|
||||
'TEST_SERVER_URL': 'https://ocis-server:9200',
|
||||
@@ -1430,7 +1430,7 @@ def cloneCoreRepos(coreBranch, coreCommit):
|
||||
return [
|
||||
{
|
||||
'name': 'clone-core-repos',
|
||||
'image': 'owncloudci/php:7.2',
|
||||
'image': 'owncloudci/php:7.4',
|
||||
'pull': 'always',
|
||||
'commands': [
|
||||
'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/tmp/testing',
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
* Change - Update phoenix to v0.20.0: [#674](https://github.com/owncloud/ocis/pull/674)
|
||||
* Change - Update phoenix to v0.21.0: [#728](https://github.com/owncloud/ocis/pull/728)
|
||||
* Change - Update phoenix to v0.22.0: [#757](https://github.com/owncloud/ocis/pull/757)
|
||||
* Change - Update phoenix to v0.23.0: [#785](https://github.com/owncloud/ocis/pull/785)
|
||||
* Change - Update reva config: [#336](https://github.com/owncloud/ocis/pull/336)
|
||||
* Change - Clarify storage driver env vars: [#729](https://github.com/owncloud/ocis/pull/729)
|
||||
* Change - Settings and accounts appear in the user menu: [#656](https://github.com/owncloud/ocis/pull/656)
|
||||
@@ -54,6 +55,7 @@
|
||||
* Enhancement - Add glauth fallback backend: [#649](https://github.com/owncloud/ocis/pull/649)
|
||||
* Enhancement - Launch a storage to store ocis-metadata: [#602](https://github.com/owncloud/ocis/pull/602)
|
||||
* Enhancement - Simplify tracing config: [#92](https://github.com/owncloud/product/issues/92)
|
||||
* Enhancement - Update glauth to dev 4f029234b2308: [#786](https://github.com/owncloud/ocis/pull/786)
|
||||
* Enhancement - Update konnectd to v0.33.8: [#744](https://github.com/owncloud/ocis/pull/744)
|
||||
* Enhancement - Update reva to cdb3d6688da5: [#748](https://github.com/owncloud/ocis/pull/748)
|
||||
* Enhancement - Update reva to dd3a8c0f38: [#725](https://github.com/owncloud/ocis/pull/725)
|
||||
@@ -386,6 +388,16 @@
|
||||
https://github.com/owncloud/ocis/pull/757
|
||||
https://github.com/owncloud/phoenix/releases/tag/v0.22.0
|
||||
|
||||
* Change - Update phoenix to v0.23.0: [#785](https://github.com/owncloud/ocis/pull/785)
|
||||
|
||||
Tags: web
|
||||
|
||||
We updated phoenix to v0.23.0. Please refer to the changelog (linked) for details on the
|
||||
phoenix release.
|
||||
|
||||
https://github.com/owncloud/ocis/pull/785
|
||||
https://github.com/owncloud/phoenix/releases/tag/v0.23.0
|
||||
|
||||
* Change - Update reva config: [#336](https://github.com/owncloud/ocis/pull/336)
|
||||
|
||||
* EOS homes are not configured with an enable-flag anymore, but with a dedicated storage driver.
|
||||
@@ -1408,6 +1420,12 @@
|
||||
https://github.com/owncloud/ocis/pull/329
|
||||
https://github.com/owncloud/ocis/pull/409
|
||||
|
||||
* Enhancement - Update glauth to dev 4f029234b2308: [#786](https://github.com/owncloud/ocis/pull/786)
|
||||
|
||||
Includes a bugfix, don't mix graph and provisioning api.
|
||||
|
||||
https://github.com/owncloud/ocis/pull/786
|
||||
|
||||
* Enhancement - Update konnectd to v0.33.8: [#744](https://github.com/owncloud/ocis/pull/744)
|
||||
|
||||
This update adds options which allow the configuration of oidc-token expiration parameters:
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
Enhancement: Update glauth to dev 4f029234b2308
|
||||
|
||||
Includes a bugfix, don't mix graph and provisioning api.
|
||||
|
||||
https://github.com/owncloud/ocis/pull/786
|
||||
@@ -0,0 +1,8 @@
|
||||
Change: Update phoenix to v0.23.0
|
||||
|
||||
Tags: web
|
||||
|
||||
We updated phoenix to v0.23.0. Please refer to the changelog (linked) for details on the phoenix release.
|
||||
|
||||
https://github.com/owncloud/ocis/pull/785
|
||||
https://github.com/owncloud/phoenix/releases/tag/v0.23.0
|
||||
@@ -57,5 +57,12 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the grpc server. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-accounts server --help
|
||||
accounts server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
accounts version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
@@ -42,7 +42,7 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-konnectd server --help
|
||||
konnectd server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Health
|
||||
@@ -50,9 +50,16 @@ ocis-konnectd server --help
|
||||
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-konnectd health --help
|
||||
konnectd health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
konnectd version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
## Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `KONNECTD_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9134/metrics`.
|
||||
|
||||
@@ -42,7 +42,7 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-ocs server --help
|
||||
ocs server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Health
|
||||
@@ -50,9 +50,16 @@ ocis-ocs server --help
|
||||
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-ocs health --help
|
||||
ocs health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocs version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
## Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `OCS_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9114/metrics`.
|
||||
|
||||
@@ -42,5 +42,12 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http server. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-proxy server --help
|
||||
proxy server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
proxy version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
@@ -160,7 +160,7 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-settings server --help
|
||||
settings server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Health
|
||||
@@ -168,9 +168,16 @@ ocis-settings server --help
|
||||
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-settings health --help
|
||||
settings health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
settings version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
## Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `SETTINGS_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9194/metrics`.
|
||||
|
||||
@@ -160,7 +160,7 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-store server --help
|
||||
store server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Health
|
||||
@@ -168,9 +168,16 @@ ocis-store server --help
|
||||
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-store health --help
|
||||
store health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
store version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
## Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `STORE_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9460/metrics`.
|
||||
|
||||
@@ -189,6 +189,13 @@ The health command is used to execute a health check, if the exit code equals ze
|
||||
{{ Name }} health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
{{ Name }} version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
## Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `THUMBNAILS_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9114/metrics`.
|
||||
|
||||
@@ -157,7 +157,7 @@ The program provides a few sub-commands on execution. The available configuratio
|
||||
The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
ocis-webdav server --help
|
||||
webdav server --help
|
||||
{{< / highlight >}}
|
||||
|
||||
#### Health
|
||||
@@ -165,9 +165,16 @@ ocis-webdav server --help
|
||||
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-webdav health --help
|
||||
webdav health --help
|
||||
{{< / highlight >}}
|
||||
|
||||
### Version
|
||||
The version command lists the versions of all running instances. For further help please execute:
|
||||
|
||||
{{< highlight txt >}}
|
||||
webdav version --help
|
||||
{{< /highlight >}}
|
||||
|
||||
### Metrics
|
||||
|
||||
This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `WEBDAV_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9119/metrics`.
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ require (
|
||||
contrib.go.opencensus.io/exporter/zipkin v0.1.2
|
||||
github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e
|
||||
github.com/UnnoTed/fileb0x v1.1.4
|
||||
github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf
|
||||
github.com/glauth/glauth v1.1.3-0.20201030130813-4f029234b230
|
||||
github.com/go-logr/logr v0.1.0
|
||||
github.com/micro/cli/v2 v2.1.2
|
||||
github.com/micro/go-micro/v2 v2.9.1
|
||||
|
||||
+2
-2
@@ -266,8 +266,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc=
|
||||
github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY=
|
||||
github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf h1:3ejnL7OvxCJ6XiEJjv16odGGUPvZlqjfDLefPVF7Vrw=
|
||||
github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf/go.mod h1:ygO1z1pcp79iBrjbA6vqrsUxIonStjBncosl2a9/Dx8=
|
||||
github.com/glauth/glauth v1.1.3-0.20201030130813-4f029234b230 h1:2oT6sD4SUhZ94BXf0NmOaKCwbkzsweBTYRPnyTDP7xY=
|
||||
github.com/glauth/glauth v1.1.3-0.20201030130813-4f029234b230/go.mod h1:ygO1z1pcp79iBrjbA6vqrsUxIonStjBncosl2a9/Dx8=
|
||||
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
|
||||
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
|
||||
github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M=
|
||||
|
||||
@@ -3,7 +3,7 @@ NAME := ocis-phoenix
|
||||
IMPORT := github.com/owncloud/ocis/$(NAME)
|
||||
BIN := bin
|
||||
DIST := dist
|
||||
PHOENIX_ASSETS_VERSION = v0.22.0
|
||||
PHOENIX_ASSETS_VERSION = v0.23.0
|
||||
|
||||
ifeq ($(OS), Windows_NT)
|
||||
EXECUTABLE := $(NAME).exe
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,184 @@
|
||||
---
|
||||
version: '3.5'
|
||||
|
||||
networks:
|
||||
testnet:
|
||||
name: testnet
|
||||
|
||||
services:
|
||||
ocis:
|
||||
container_name: ocis
|
||||
#image: owncloud/eos-ocis:1.0.0-rc2
|
||||
build:
|
||||
context: ./docker/eos-ocis
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
ports:
|
||||
- 9200:9200
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: ocis
|
||||
networks:
|
||||
- testnet
|
||||
environment:
|
||||
# ocis log level will be used for all services
|
||||
OCIS_LOG_LEVEL: debug
|
||||
# domain setup
|
||||
# TODO currently the below lines hardcode the port to 9200, use an OCIS_URL that includes protocol and port
|
||||
OCIS_DOMAIN: ${OCIS_DOMAIN:-localhost}
|
||||
PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
KONNECTD_ISS: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration
|
||||
PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
# make home and users storages use eos
|
||||
STORAGE_HOME_DRIVER: eoshome
|
||||
STORAGE_USERS_DRIVER: eos
|
||||
# make accounts use ocis storage driver
|
||||
# TODO provision metadata storage in eos and switch to cs3 backend for accounts
|
||||
ACCOUNTS_LOG_LEVEL: debug
|
||||
ACCOUNTS_STORAGE_DISK_PATH: /var/tmp/ocis-accounts
|
||||
# TODO make id the default in ocis-storage
|
||||
STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
|
||||
STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
|
||||
STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
|
||||
# common eos settings used for both drivers: eos and eoshome
|
||||
STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
|
||||
STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
|
||||
STORAGE_DRIVER_EOS_NAMESPACE: "/eos/dockertest/reva/users"
|
||||
# the eos end xrdcopy binaries use this env var to find the eos mgm
|
||||
EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
|
||||
# TODO without this the /etc/nclcd.conf file is empty
|
||||
LDAP_BINDDN: "cn=reva,ou=sysusers,dc=example,dc=org"
|
||||
LDAP_BINDPW: "reva"
|
||||
|
||||
mgm-master:
|
||||
container_name: mgm-master
|
||||
image: owncloud/eos-mgm:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: mgm-master.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-mgm-master-log:/var/log/eos
|
||||
- eos-mgm-master-config:/var/eos/config
|
||||
- eos-mgm-master-ns-queue:/var/eos/ns-queue
|
||||
# this volume kills mgm-master during startup
|
||||
# - ./e/master/var/eos/md:/var/eos/md
|
||||
environment:
|
||||
EOS_SET_MASTER: 1
|
||||
|
||||
mq-master:
|
||||
container_name: mq-master
|
||||
image: owncloud/eos-mq:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: mq-master.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-mq-master-log:/var/log/eos
|
||||
- eos-mq-master-config:/var/eos/config
|
||||
- eos-mq-master-ns-queue:/var/eos/ns-queue
|
||||
environment:
|
||||
EOS_SET_MASTER: 1
|
||||
|
||||
fst:
|
||||
container_name: fst
|
||||
image: owncloud/eos-fst:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: fst.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-fst-log:/var/log/eos
|
||||
- eos-fst-disks:/disks
|
||||
environment:
|
||||
EOS_MGM_URL: "root://mgm-master.testnet"
|
||||
|
||||
quark-1:
|
||||
container_name: quark-1
|
||||
image: owncloud/eos-qdb:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: quark-1.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-quarkdb1:/var/lib/quarkdb
|
||||
environment:
|
||||
EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
|
||||
EOS_QDB_PORT: "7777"
|
||||
EOS_QDB_MODE: "raft"
|
||||
EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
|
||||
EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
|
||||
|
||||
quark-2:
|
||||
container_name: quark-2
|
||||
image: owncloud/eos-qdb:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: quark-2.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-quarkdb2:/var/lib/quarkdb
|
||||
environment:
|
||||
EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
|
||||
EOS_QDB_PORT: "7777"
|
||||
EOS_QDB_MODE: "raft"
|
||||
EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
|
||||
EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
|
||||
|
||||
quark-3:
|
||||
container_name: quark-3
|
||||
image: owncloud/eos-qdb:4.6.5
|
||||
tty: true
|
||||
privileged: true
|
||||
stdin_open: true
|
||||
env_file:
|
||||
- ./config/eos-docker.env
|
||||
hostname: quark-3.testnet
|
||||
networks:
|
||||
- testnet
|
||||
volumes:
|
||||
- eos-quarkdb3:/var/lib/quarkdb
|
||||
environment:
|
||||
EOS_QDB_DIR: "/var/lib/quarkdb/eosns"
|
||||
EOS_QDB_PORT: "7777"
|
||||
EOS_QDB_MODE: "raft"
|
||||
EOS_QDB_CLUSTER_ID: "3d659c1a-e70f-43f0-bed4-941a2ca0765b"
|
||||
EOS_QDB_NODES: "quark-1.testnet:7777,quark-2.testnet:7777,quark-3.testnet:7777"
|
||||
|
||||
volumes:
|
||||
eos-mgm-master-log:
|
||||
eos-mgm-master-config:
|
||||
eos-mgm-master-ns-queue:
|
||||
eos-mq-master-log:
|
||||
eos-mq-master-config:
|
||||
eos-mq-master-ns-queue:
|
||||
eos-fst-log:
|
||||
eos-fst-disks:
|
||||
eos-quarkdb1:
|
||||
eos-quarkdb2:
|
||||
eos-quarkdb3:
|
||||
@@ -19,23 +19,4 @@ mkdir -p /var/tmp/reva
|
||||
|
||||
echo "----- [ocis] Starting oCIS -----"
|
||||
# todo start ocis as daemon not as root
|
||||
ocis reva-storage-home &
|
||||
ocis reva-storage-home-data &
|
||||
ocis reva-storage-eos &
|
||||
ocis reva-storage-eos-data &
|
||||
ocis reva-storage-public-link &
|
||||
ocis micro &
|
||||
ocis glauth &
|
||||
ocis graph-explorer &
|
||||
ocis graph &
|
||||
ocis konnectd &
|
||||
ocis phoenix &
|
||||
ocis thumbnails &
|
||||
ocis webdav &
|
||||
ocis reva-auth-basic &
|
||||
ocis reva-auth-bearer &
|
||||
ocis reva-frontend &
|
||||
ocis reva-gateway &
|
||||
ocis reva-sharing &
|
||||
ocis reva-users &
|
||||
exec ocis proxy
|
||||
exec ocis server
|
||||
|
||||
@@ -349,6 +349,8 @@ github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc
|
||||
github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY=
|
||||
github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf h1:3ejnL7OvxCJ6XiEJjv16odGGUPvZlqjfDLefPVF7Vrw=
|
||||
github.com/glauth/glauth v1.1.3-0.20201005201919-4d42af8aacbf/go.mod h1:ygO1z1pcp79iBrjbA6vqrsUxIonStjBncosl2a9/Dx8=
|
||||
github.com/glauth/glauth v1.1.3-0.20201030130813-4f029234b230 h1:2oT6sD4SUhZ94BXf0NmOaKCwbkzsweBTYRPnyTDP7xY=
|
||||
github.com/glauth/glauth v1.1.3-0.20201030130813-4f029234b230/go.mod h1:ygO1z1pcp79iBrjbA6vqrsUxIonStjBncosl2a9/Dx8=
|
||||
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
|
||||
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
|
||||
github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4=
|
||||
|
||||
@@ -643,26 +643,38 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
|
||||
apiSharePublicLink2/updatePublicLinkShare.feature:284
|
||||
apiSharePublicLink2/updatePublicLinkShare.feature:285
|
||||
#
|
||||
# https://github.com/owncloud/ocis/issues/776 investigate ocis issues in apiSharePublicLink2/reShareAsPublicLinkToShares
|
||||
# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:62
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:63
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:77
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:78
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:136
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:137
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180
|
||||
#
|
||||
# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:97
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:98
|
||||
#
|
||||
# https://github.com/owncloud/product/issues/272 [OCIS] old public webdav api doesnt works
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:50
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:51
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:71
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:72
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:92
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:93
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:114
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115
|
||||
#
|
||||
# https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work
|
||||
#
|
||||
@@ -1336,10 +1348,6 @@ apiWebdavProperties2/getFileProperties.feature:327
|
||||
apiWebdavProperties2/getFileProperties.feature:328
|
||||
apiWebdavProperties2/getFileProperties.feature:376
|
||||
apiWebdavProperties2/getFileProperties.feature:377
|
||||
apiWebdavProperties2/getFileProperties.feature:389
|
||||
apiWebdavProperties2/getFileProperties.feature:390
|
||||
apiWebdavProperties2/getFileProperties.feature:402
|
||||
apiWebdavProperties2/getFileProperties.feature:403
|
||||
apiWebdavProperties2/getFileProperties.feature:415
|
||||
apiWebdavProperties2/getFileProperties.feature:416
|
||||
apiWebdavProperties2/getFileProperties.feature:428
|
||||
@@ -1492,40 +1500,40 @@ apiWebdavPreviews/previews.feature:16
|
||||
apiWebdavPreviews/previews.feature:17
|
||||
apiWebdavPreviews/previews.feature:18
|
||||
apiWebdavPreviews/previews.feature:19
|
||||
apiWebdavPreviews/previews.feature:29
|
||||
apiWebdavPreviews/previews.feature:30
|
||||
apiWebdavPreviews/previews.feature:31
|
||||
apiWebdavPreviews/previews.feature:32
|
||||
apiWebdavPreviews/previews.feature:33
|
||||
apiWebdavPreviews/previews.feature:34
|
||||
apiWebdavPreviews/previews.feature:35
|
||||
apiWebdavPreviews/previews.feature:46
|
||||
apiWebdavPreviews/previews.feature:36
|
||||
apiWebdavPreviews/previews.feature:47
|
||||
apiWebdavPreviews/previews.feature:48
|
||||
apiWebdavPreviews/previews.feature:49
|
||||
apiWebdavPreviews/previews.feature:50
|
||||
apiWebdavPreviews/previews.feature:51
|
||||
apiWebdavPreviews/previews.feature:52
|
||||
apiWebdavPreviews/previews.feature:55
|
||||
apiWebdavPreviews/previews.feature:70
|
||||
apiWebdavPreviews/previews.feature:53
|
||||
apiWebdavPreviews/previews.feature:56
|
||||
apiWebdavPreviews/previews.feature:71
|
||||
apiWebdavPreviews/previews.feature:72
|
||||
apiWebdavPreviews/previews.feature:82
|
||||
apiWebdavPreviews/previews.feature:73
|
||||
apiWebdavPreviews/previews.feature:83
|
||||
apiWebdavPreviews/previews.feature:86
|
||||
apiWebdavPreviews/previews.feature:94
|
||||
apiWebdavPreviews/previews.feature:103
|
||||
apiWebdavPreviews/previews.feature:112
|
||||
apiWebdavPreviews/previews.feature:119
|
||||
apiWebdavPreviews/previews.feature:126
|
||||
apiWebdavPreviews/previews.feature:134
|
||||
apiWebdavPreviews/previews.feature:143
|
||||
apiWebdavPreviews/previews.feature:162
|
||||
apiWebdavPreviews/previews.feature:84
|
||||
apiWebdavPreviews/previews.feature:87
|
||||
apiWebdavPreviews/previews.feature:95
|
||||
apiWebdavPreviews/previews.feature:104
|
||||
apiWebdavPreviews/previews.feature:113
|
||||
apiWebdavPreviews/previews.feature:120
|
||||
apiWebdavPreviews/previews.feature:127
|
||||
apiWebdavPreviews/previews.feature:135
|
||||
apiWebdavPreviews/previews.feature:144
|
||||
apiWebdavPreviews/previews.feature:163
|
||||
apiWebdavPreviews/previews.feature:164
|
||||
apiWebdavPreviews/previews.feature:165
|
||||
apiWebdavPreviews/previews.feature:177
|
||||
apiWebdavPreviews/previews.feature:166
|
||||
apiWebdavPreviews/previews.feature:178
|
||||
apiWebdavPreviews/previews.feature:179
|
||||
#
|
||||
# https://github.com/owncloud/ocis-ocs/issues/35 group support is not yet implemented
|
||||
#
|
||||
|
||||
@@ -625,26 +625,38 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
|
||||
apiSharePublicLink2/updatePublicLinkShare.feature:284
|
||||
apiSharePublicLink2/updatePublicLinkShare.feature:285
|
||||
#
|
||||
# https://github.com/owncloud/ocis/issues/776 investigate ocis issues in apiSharePublicLink2/reShareAsPublicLinkToShares
|
||||
# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184
|
||||
apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:62
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:63
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:77
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:78
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:136
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:137
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180
|
||||
#
|
||||
# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:97
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:98
|
||||
#
|
||||
# https://github.com/owncloud/product/issues/272 [OCIS] old public webdav api doesnt works
|
||||
#
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:50
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:51
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:71
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:72
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:92
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:93
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:114
|
||||
apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115
|
||||
#
|
||||
# https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work
|
||||
#
|
||||
@@ -1321,10 +1333,6 @@ apiWebdavProperties2/getFileProperties.feature:327
|
||||
apiWebdavProperties2/getFileProperties.feature:328
|
||||
apiWebdavProperties2/getFileProperties.feature:376
|
||||
apiWebdavProperties2/getFileProperties.feature:377
|
||||
apiWebdavProperties2/getFileProperties.feature:389
|
||||
apiWebdavProperties2/getFileProperties.feature:390
|
||||
apiWebdavProperties2/getFileProperties.feature:402
|
||||
apiWebdavProperties2/getFileProperties.feature:403
|
||||
apiWebdavProperties2/getFileProperties.feature:415
|
||||
apiWebdavProperties2/getFileProperties.feature:416
|
||||
apiWebdavProperties2/getFileProperties.feature:428
|
||||
@@ -1449,40 +1457,40 @@ apiWebdavPreviews/previews.feature:16
|
||||
apiWebdavPreviews/previews.feature:17
|
||||
apiWebdavPreviews/previews.feature:18
|
||||
apiWebdavPreviews/previews.feature:19
|
||||
apiWebdavPreviews/previews.feature:29
|
||||
apiWebdavPreviews/previews.feature:30
|
||||
apiWebdavPreviews/previews.feature:31
|
||||
apiWebdavPreviews/previews.feature:32
|
||||
apiWebdavPreviews/previews.feature:33
|
||||
apiWebdavPreviews/previews.feature:34
|
||||
apiWebdavPreviews/previews.feature:35
|
||||
apiWebdavPreviews/previews.feature:46
|
||||
apiWebdavPreviews/previews.feature:36
|
||||
apiWebdavPreviews/previews.feature:47
|
||||
apiWebdavPreviews/previews.feature:48
|
||||
apiWebdavPreviews/previews.feature:49
|
||||
apiWebdavPreviews/previews.feature:50
|
||||
apiWebdavPreviews/previews.feature:51
|
||||
apiWebdavPreviews/previews.feature:52
|
||||
apiWebdavPreviews/previews.feature:55
|
||||
apiWebdavPreviews/previews.feature:70
|
||||
apiWebdavPreviews/previews.feature:53
|
||||
apiWebdavPreviews/previews.feature:56
|
||||
apiWebdavPreviews/previews.feature:71
|
||||
apiWebdavPreviews/previews.feature:72
|
||||
apiWebdavPreviews/previews.feature:82
|
||||
apiWebdavPreviews/previews.feature:73
|
||||
apiWebdavPreviews/previews.feature:83
|
||||
apiWebdavPreviews/previews.feature:86
|
||||
apiWebdavPreviews/previews.feature:94
|
||||
apiWebdavPreviews/previews.feature:103
|
||||
apiWebdavPreviews/previews.feature:112
|
||||
apiWebdavPreviews/previews.feature:119
|
||||
apiWebdavPreviews/previews.feature:126
|
||||
apiWebdavPreviews/previews.feature:134
|
||||
apiWebdavPreviews/previews.feature:143
|
||||
apiWebdavPreviews/previews.feature:162
|
||||
apiWebdavPreviews/previews.feature:84
|
||||
apiWebdavPreviews/previews.feature:87
|
||||
apiWebdavPreviews/previews.feature:95
|
||||
apiWebdavPreviews/previews.feature:104
|
||||
apiWebdavPreviews/previews.feature:113
|
||||
apiWebdavPreviews/previews.feature:120
|
||||
apiWebdavPreviews/previews.feature:127
|
||||
apiWebdavPreviews/previews.feature:135
|
||||
apiWebdavPreviews/previews.feature:144
|
||||
apiWebdavPreviews/previews.feature:163
|
||||
apiWebdavPreviews/previews.feature:164
|
||||
apiWebdavPreviews/previews.feature:165
|
||||
apiWebdavPreviews/previews.feature:177
|
||||
apiWebdavPreviews/previews.feature:166
|
||||
apiWebdavPreviews/previews.feature:178
|
||||
apiWebdavPreviews/previews.feature:179
|
||||
#
|
||||
# https://github.com/owncloud/ocis-ocs/issues/35 group support is not yet implemented
|
||||
#
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"config" : {
|
||||
"platform": {
|
||||
"php": "7.2"
|
||||
"php": "7.4"
|
||||
}
|
||||
},
|
||||
"require": {
|
||||
|
||||
Reference in New Issue
Block a user