From 974d6eb79d18ae882f9635f933db573eb5775b26 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 1 Jul 2022 10:18:33 +0200 Subject: [PATCH] docs(installation): fix guides (#3878) * docs(installation): download traefik config * docs(installation): remove unnecessary zitadel user certs --- .../installation/configure/docker-compose.yaml | 12 +----------- .../loadbalancing-example/docker-compose.yaml | 14 ++------------ .../loadbalancing-example/loadbalancing-example.md | 4 ++++ 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/docs/docs/guides/installation/configure/docker-compose.yaml b/docs/docs/guides/installation/configure/docker-compose.yaml index 65d10a2f55..14a855945a 100644 --- a/docs/docs/guides/installation/configure/docker-compose.yaml +++ b/docs/docs/guides/installation/configure/docker-compose.yaml @@ -22,20 +22,10 @@ services: chown: image: 'cockroachdb/cockroach:v22.1.0' entrypoint: [ '/bin/bash', '-c' ] - command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && cp /certs/client.zitadel_user.crt /zitadel-certs/ && cp /certs/client.zitadel_user.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] + command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] volumes: - 'certs:/certs:ro' - 'zitadel-certs:/zitadel-certs:rw' - depends_on: - client-certs: - condition: 'service_completed_successfully' - - client-certs: - image: 'cockroachdb/cockroach:v22.1.0' - command: 'cert create-client --certs-dir /certs/ --ca-key /certs/ca.key zitadel_user' - restart: 'on-failure' - volumes: - - 'certs:/certs:rw' depends_on: my-cockroach-db: condition: 'service_healthy' diff --git a/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml b/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml index 8e76dd1a74..22df9694ba 100644 --- a/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml +++ b/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml @@ -9,7 +9,7 @@ services: - "80:80" - "443:443" volumes: - - "./traefik.yaml:/etc/traefik/traefik.yaml" + - "./example-traefik.yaml:/etc/traefik/traefik.yaml" zitadel: restart: 'always' @@ -30,20 +30,10 @@ services: chown: image: 'cockroachdb/cockroach:v22.1.0' entrypoint: [ '/bin/bash', '-c' ] - command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && cp /certs/client.zitadel_user.crt /zitadel-certs/ && cp /certs/client.zitadel_user.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] + command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] volumes: - 'certs:/certs:ro' - 'zitadel-certs:/zitadel-certs:rw' - depends_on: - client-certs: - condition: 'service_completed_successfully' - - client-certs: - image: 'cockroachdb/cockroach:v22.1.0' - command: 'cert create-client --certs-dir /certs/ --ca-key /certs/ca.key zitadel_user' - restart: 'on-failure' - volumes: - - 'certs:/certs:rw' depends_on: my-cockroach-db: condition: 'service_healthy' diff --git a/docs/docs/guides/installation/loadbalancing-example/loadbalancing-example.md b/docs/docs/guides/installation/loadbalancing-example/loadbalancing-example.md index b8a055e24b..4204282557 100644 --- a/docs/docs/guides/installation/loadbalancing-example/loadbalancing-example.md +++ b/docs/docs/guides/installation/loadbalancing-example/loadbalancing-example.md @@ -13,6 +13,7 @@ The setup is tested against Docker version 20.10.17 and Docker Compose version v By executing the commands below, you will download the following files: - [docker-compose.yaml](./docker-compose.yaml) +- [example-traefik.yaml](./example-traefik.yaml) - [example-zitadel-config.yaml](./example-zitadel-config.yaml) - [example-zitadel-secrets.yaml](./example-zitadel-secrets.yaml) - [example-zitadel-init-steps.yaml](./example-zitadel-init-steps.yaml) @@ -21,6 +22,9 @@ By executing the commands below, you will download the following files: # Download the docker compose example configuration. For example: wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml +# Download the docker compose example configuration. For example: +wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/example-traefik.yaml + # Download and adjust the example configuration file containing standard configuration wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/example-zitadel-config.yaml