From 25c516ab67c5c9183b04c7933cf1b2721fd703f1 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 15:25:31 +0100 Subject: [PATCH] rename cs3_users_ocis deployment example to ocis_ldap --- .drone.star | 4 ++-- .../{cs3_users_ocis => ocis_ldap}/latest.yml | 16 ++++++++-------- .../{cs3_users_ocis => ocis_ldap}/released.yml | 16 ++++++++-------- .../examples/{cs3_users_ocis => ocis_ldap}/.env | 0 .../{cs3_users_ocis => ocis_ldap}/README.md | 4 ++-- .../config/ldap/ldif/10_owncloud_schema.ldif | 0 .../config/ldap/ldif/20_users.ldif | 0 .../config/ldap/ldif/30_groups.ldif | 0 .../config/ocis/entrypoint-override.sh | 0 .../config/ocis/proxy.json | 0 .../config/ocis/web-config.dist.json | 0 .../docker-compose.yml | 0 .../docker-compose-additions.yml | 0 docs/ocis/deployment/continuous_deployment.md | 10 +++++----- docs/ocis/deployment/ocis_ldap.md | 12 ++++++++++++ 15 files changed, 37 insertions(+), 25 deletions(-) rename deployments/continuous-deployment-config/{cs3_users_ocis => ocis_ldap}/latest.yml (72%) rename deployments/continuous-deployment-config/{cs3_users_ocis => ocis_ldap}/released.yml (71%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/.env (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/README.md (54%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ldap/ldif/10_owncloud_schema.ldif (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ldap/ldif/20_users.ldif (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ldap/ldif/30_groups.ldif (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ocis/entrypoint-override.sh (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ocis/proxy.json (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/config/ocis/web-config.dist.json (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/docker-compose.yml (100%) rename deployments/examples/{cs3_users_ocis => ocis_ldap}/monitoring_tracing/docker-compose-additions.yml (100%) create mode 100644 docs/ocis/deployment/ocis_ldap.md diff --git a/.drone.star b/.drone.star index e982c75b5..b912505fc 100644 --- a/.drone.star +++ b/.drone.star @@ -1589,7 +1589,7 @@ def skipIfUnchanged(ctx, type): def example_deploys(ctx): latest_configs = [ - "cs3_users_ocis/latest.yml", + "ocis_ldap/latest.yml", "ocis_keycloak/latest.yml", "ocis_traefik/latest.yml", "ocis_wopi/latest.yml", @@ -1598,7 +1598,7 @@ def example_deploys(ctx): "oc10_ocis_parallel/latest.yml", ] released_configs = [ - "cs3_users_ocis/released.yml", + "ocis_ldap/released.yml", "ocis_keycloak/released.yml", "ocis_traefik/released.yml", "ocis_wopi/released.yml", diff --git a/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml b/deployments/continuous-deployment-config/ocis_ldap/latest.yml similarity index 72% rename from deployments/continuous-deployment-config/cs3_users_ocis/latest.yml rename to deployments/continuous-deployment-config/ocis_ldap/latest.yml index fcef5ec52..26348b942 100644 --- a/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/latest.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-cs3-users-latest +- name: continuous-deployment-ocis-ldap-latest server: server_type: cx21 image: ubuntu-20.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-cs3-users.latest.owncloud.works" + - "*.ocis-ldap.latest.owncloud.works" vars: ssh_authorized_keys: @@ -31,21 +31,21 @@ - name: ocis git_url: https://github.com/owncloud/ocis.git ref: master - docker_compose_path: deployments/examples/cs3_users_ocis + docker_compose_path: deployments/examples/ocis_ldap env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-cs3-users.latest.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-cs3-users.latest.owncloud.works + OCIS_DOMAIN: ocis.ocis-ldap.latest.owncloud.works + LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.latest.owncloud.works COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master env: NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-cs3-users.latest.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-ldap.latest.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-cs3-users.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-cs3-users-latest + OCIS_URL: ocis.ocis-ldap.latest.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-ldap-latest diff --git a/deployments/continuous-deployment-config/cs3_users_ocis/released.yml b/deployments/continuous-deployment-config/ocis_ldap/released.yml similarity index 71% rename from deployments/continuous-deployment-config/cs3_users_ocis/released.yml rename to deployments/continuous-deployment-config/ocis_ldap/released.yml index 7f0c1f5d2..c59d000a9 100644 --- a/deployments/continuous-deployment-config/cs3_users_ocis/released.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/released.yml @@ -1,5 +1,5 @@ --- -- name: continuous-deployment-ocis-cs3-users-released +- name: continuous-deployment-ocis-ldap-released server: server_type: cx21 image: ubuntu-20.04 @@ -14,7 +14,7 @@ - /var/lib/docker/volumes/ocis_certs domains: - - "*.ocis-cs3-users.released.owncloud.works" + - "*.ocis-ldap.released.owncloud.works" vars: ssh_authorized_keys: @@ -31,21 +31,21 @@ - name: ocis git_url: https://github.com/owncloud/ocis.git ref: master - docker_compose_path: deployments/examples/cs3_users_ocis + docker_compose_path: deployments/examples/ocis_ldap env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com OCIS_DOCKER_TAG: 1 - OCIS_DOMAIN: ocis.ocis-cs3-users.released.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.ocis-cs3-users.released.owncloud.works + OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works + LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.released.owncloud.works COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master env: NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-cs3-users.released.owncloud.works + TELEMETRY_SERVE_DOMAIN: telemetry.ocis-ldap.released.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-cs3-users.released.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-cs3-users-released + OCIS_URL: ocis.ocis-ldap.released.owncloud.works + OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-ldap-released diff --git a/deployments/examples/cs3_users_ocis/.env b/deployments/examples/ocis_ldap/.env similarity index 100% rename from deployments/examples/cs3_users_ocis/.env rename to deployments/examples/ocis_ldap/.env diff --git a/deployments/examples/cs3_users_ocis/README.md b/deployments/examples/ocis_ldap/README.md similarity index 54% rename from deployments/examples/cs3_users_ocis/README.md rename to deployments/examples/ocis_ldap/README.md index 4a00b040f..bcdbaeec1 100644 --- a/deployments/examples/cs3_users_ocis/README.md +++ b/deployments/examples/ocis_ldap/README.md @@ -1,6 +1,6 @@ --- -document this deployment example in docs/ocis/deployment/cs3_users_ocis.md +document this deployment example in docs/ocis/deployment/ocis_ldap.md --- -Please refer to [our documentation](https://owncloud.dev/ocis/deployment/cs3_users_ocis/) +Please refer to [our documentation](https://owncloud.dev/ocis/deployment/ocis_ldap/) for instructions on how to deploy this scenario. diff --git a/deployments/examples/cs3_users_ocis/config/ldap/ldif/10_owncloud_schema.ldif b/deployments/examples/ocis_ldap/config/ldap/ldif/10_owncloud_schema.ldif similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ldap/ldif/10_owncloud_schema.ldif rename to deployments/examples/ocis_ldap/config/ldap/ldif/10_owncloud_schema.ldif diff --git a/deployments/examples/cs3_users_ocis/config/ldap/ldif/20_users.ldif b/deployments/examples/ocis_ldap/config/ldap/ldif/20_users.ldif similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ldap/ldif/20_users.ldif rename to deployments/examples/ocis_ldap/config/ldap/ldif/20_users.ldif diff --git a/deployments/examples/cs3_users_ocis/config/ldap/ldif/30_groups.ldif b/deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ldap/ldif/30_groups.ldif rename to deployments/examples/ocis_ldap/config/ldap/ldif/30_groups.ldif diff --git a/deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_ldap/config/ocis/entrypoint-override.sh similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ocis/entrypoint-override.sh rename to deployments/examples/ocis_ldap/config/ocis/entrypoint-override.sh diff --git a/deployments/examples/cs3_users_ocis/config/ocis/proxy.json b/deployments/examples/ocis_ldap/config/ocis/proxy.json similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ocis/proxy.json rename to deployments/examples/ocis_ldap/config/ocis/proxy.json diff --git a/deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json b/deployments/examples/ocis_ldap/config/ocis/web-config.dist.json similarity index 100% rename from deployments/examples/cs3_users_ocis/config/ocis/web-config.dist.json rename to deployments/examples/ocis_ldap/config/ocis/web-config.dist.json diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml similarity index 100% rename from deployments/examples/cs3_users_ocis/docker-compose.yml rename to deployments/examples/ocis_ldap/docker-compose.yml diff --git a/deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml similarity index 100% rename from deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml rename to deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md index 1961aee69..0308619a5 100644 --- a/docs/ocis/deployment/continuous_deployment.md +++ b/docs/ocis/deployment/continuous_deployment.md @@ -115,7 +115,7 @@ Credentials: - oCIS: [ocis.ocis-s3.latest.owncloud.works](https://ocis.ocis-s3.latest.owncloud.works) - MinIO: [minio.ocis-s3.latest.owncloud.works](https://minio.ocis-s3.latest.owncloud.works) -# oCIS with CS3 users +# oCIS with LDAP for users and groups Credentials: @@ -126,10 +126,10 @@ Credentials: ## Latest -- oCIS: [ocis.ocis-cs3-users.latest.owncloud.works](https://ocis.ocis-cs3-users.latest.owncloud.works) -- LDAP admin: [ldap.ocis-cs3-users.latest.owncloud.works](https://ldap.ocis-cs3-users.latest.owncloud.works) +- oCIS: [ocis.ocis-ldap.latest.owncloud.works](https://ocis.ocis-ldap.latest.owncloud.works) +- LDAP admin: [ldap.ocis-ldap.latest.owncloud.works](https://ldap.ocis-ldap.latest.owncloud.works) ## Released -- oCIS: [ocis.ocis-cs3-users.released.owncloud.works](https://ocis.ocis-cs3-users.released.owncloud.works) -- LDAP admin: [ldap.ocis-cs3-users.released.owncloud.works](https://ldap.ocis-cs3-users.released.owncloud.works) +- oCIS: [ocis.ocis-ldap.released.owncloud.works](https://ocis.ocis-ldap.released.owncloud.works) +- LDAP admin: [ldap.ocis-ldap.released.owncloud.works](https://ldap.ocis-ldap.released.owncloud.works) diff --git a/docs/ocis/deployment/ocis_ldap.md b/docs/ocis/deployment/ocis_ldap.md new file mode 100644 index 000000000..a75f46ae4 --- /dev/null +++ b/docs/ocis/deployment/ocis_ldap.md @@ -0,0 +1,12 @@ +--- +title: "oCIS with LDAP" +date: 2020-10-12T14:04:00+01:00 +weight: 24 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs/ocis/deployment +geekdocFilePath: ocis_ldap.md +--- + +{{< toc >}} + +TODO