diff --git a/deployments/examples/ocis_multi/.DS_Store b/deployments/examples/ocis_multi/.DS_Store deleted file mode 100644 index a218b1f9943..00000000000 Binary files a/deployments/examples/ocis_multi/.DS_Store and /dev/null differ diff --git a/deployments/examples/ocis_multi/README.md b/deployments/examples/ocis_multi/README.md index 0837071b7c9..9fae454865e 100644 --- a/deployments/examples/ocis_multi/README.md +++ b/deployments/examples/ocis_multi/README.md @@ -1,6 +1,18 @@ ---- -document this deployment example in: docs/ocis/deployment/ocis_keycloak.md ---- +# Infinite Scale Multi-Instance Deployment Example + +This docker-compose file spins up 2 ocis instances connected to the same keycloak instance. +- `ocis.owncloud.test` +- `ocis.ocm.owncloud.test` + +Demo User have different roles on different instances + +| User | ocis.owncloud.test | ocis.ocm.owncloud.test | +| --- | --- | --- | +| admin | admin | admin | +| einstein | user-light | user-light | +| katherine | space-admin | | +| marie | user-light | user | +| moss | | admin | | +| richard | user | user-light | + -Please refer to [our documentation](https://owncloud.dev/ocis/deployment/ocis_keycloak/) -for instructions on how to deploy this scenario. diff --git a/deployments/examples/ocis_multi/config/.DS_Store b/deployments/examples/ocis_multi/config/.DS_Store deleted file mode 100644 index 5249049a05b..00000000000 Binary files a/deployments/examples/ocis_multi/config/.DS_Store and /dev/null differ diff --git a/deployments/examples/ocis_multi/config/keycloak/ocis-realm.dist.json b/deployments/examples/ocis_multi/config/keycloak/ocis-realm.dist.json index b8fc99d48a6..f17ee60ce8e 100644 --- a/deployments/examples/ocis_multi/config/keycloak/ocis-realm.dist.json +++ b/deployments/examples/ocis_multi/config/keycloak/ocis-realm.dist.json @@ -675,6 +675,10 @@ "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}" } ], + "attributes": { + "memberOf": ["base"], + "guestOf": [] + }, "disableableCredentialTypes": [], "requiredActions": [], "realmRoles": [ @@ -703,6 +707,10 @@ "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}" } ], + "attributes": { + "memberOf": ["ocm"], + "guestOf": ["base"] + }, "disableableCredentialTypes": [], "requiredActions": [], "realmRoles": [ @@ -735,8 +743,8 @@ "enabled": true, "totp": false, "attributes": { - "memberOf": "ocm", - "guestOf": "base" + "memberOf": ["ocm"], + "guestOf": [] }, "credentials": [ { @@ -784,6 +792,10 @@ "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\",\"additionalParameters\":{}}" } ], + "attributes": { + "memberOf": ["base"], + "guestOf": ["ocm"] + }, "disableableCredentialTypes": [], "requiredActions": [], "realmRoles": [ diff --git a/deployments/examples/ocis_multi/config/ocis/csp-ocm.yaml b/deployments/examples/ocis_multi/config/ocis/csp-ocm.yaml index cbd8ec020d3..fca948d96b9 100644 --- a/deployments/examples/ocis_multi/config/ocis/csp-ocm.yaml +++ b/deployments/examples/ocis_multi/config/ocis/csp-ocm.yaml @@ -16,8 +16,6 @@ directives: - '''self''' - 'blob:' - 'https://embed.diagrams.net/' - # In contrary to bash and docker the default is given after the | character - - 'https://${COLLABORA_DOMAIN|collabora.ocm.next.owncloud.test}/' # This is needed for the external-sites web extension when embedding sites - 'https://owncloud.dev' img-src: @@ -25,8 +23,6 @@ directives: - 'data:' - 'blob:' - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' - # In contrary to bash and docker the default is given after the | character - - 'https://${COLLABORA_DOMAIN|collabora.ocm.next.owncloud.test}/' manifest-src: - '''self''' media-src: diff --git a/deployments/examples/ocis_multi/docker-compose.yml b/deployments/examples/ocis_multi/docker-compose.yml index bbade2717d7..76466600f06 100644 --- a/deployments/examples/ocis_multi/docker-compose.yml +++ b/deployments/examples/ocis_multi/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: traefik: - image: traefik:v2.9.1 + image: traefik:v3.6.4 networks: ocis-net: aliases: