From 680dba1628ae61041dcb5d0f81835cd46d432c57 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Wed, 6 Mar 2024 13:41:17 +0100 Subject: [PATCH] docs: don't propose setting a random masterkey to env (#7495) * docs: don't suggest setting a random masterkey to env * read masterkey from file * read masterkey from file --- .../loadbalancing-example/loadbalancing-example.mdx | 8 ++++---- docs/docs/self-hosting/manage/configure/_compose.mdx | 8 ++++---- docs/docs/self-hosting/manage/configure/_linuxunix.mdx | 9 ++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/docs/self-hosting/deploy/loadbalancing-example/loadbalancing-example.mdx b/docs/docs/self-hosting/deploy/loadbalancing-example/loadbalancing-example.mdx index ec07cae34e..0c51a230a3 100644 --- a/docs/docs/self-hosting/deploy/loadbalancing-example/loadbalancing-example.mdx +++ b/docs/docs/self-hosting/deploy/loadbalancing-example/loadbalancing-example.mdx @@ -53,10 +53,10 @@ wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/docs/self-hosti # Download and adjust the example configuration file containing database initialization configuration. wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/docs/self-hosting/deploy/loadbalancing-example/example-zitadel-init-steps.yaml -# A single ZITADEL instance always needs the same 32 characters long masterkey -# If you haven't done so already, you can generate a new one. -# For example: -export ZITADEL_MASTERKEY="$(tr -dc A-Za-z0-9 ./zitadel-masterkey +export ZITADEL_MASTERKEY="$(cat ./zitadel-masterkey)" # Run the database and application containers docker compose up --detach diff --git a/docs/docs/self-hosting/manage/configure/_compose.mdx b/docs/docs/self-hosting/manage/configure/_compose.mdx index ade03169d8..803842c58e 100644 --- a/docs/docs/self-hosting/manage/configure/_compose.mdx +++ b/docs/docs/self-hosting/manage/configure/_compose.mdx @@ -34,10 +34,10 @@ wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/docs/self-hosti # Download and adjust the example configuration file containing database initialization configuration. wget https://raw.githubusercontent.com/zitadel/zitadel/main/docs/docs/self-hosting/manage/configure/example-zitadel-init-steps.yaml -# A single ZITADEL instance always needs the same 32 characters long masterkey -# If you haven't done so already, you can generate a new one -# For example: -export ZITADEL_MASTERKEY="$(tr -dc A-Za-z0-9 ./zitadel-masterkey +export ZITADEL_MASTERKEY="$(cat ./zitadel-masterkey)" # Run the database and application containers docker compose up --detach diff --git a/docs/docs/self-hosting/manage/configure/_linuxunix.mdx b/docs/docs/self-hosting/manage/configure/_linuxunix.mdx index e68ae4e8d1..0aac2036f5 100644 --- a/docs/docs/self-hosting/manage/configure/_linuxunix.mdx +++ b/docs/docs/self-hosting/manage/configure/_linuxunix.mdx @@ -55,11 +55,10 @@ export ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE=disable export ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME="root" export ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD="RootPassword1!" -# A single ZITADEL instance always needs the same 32 characters long masterkey -# If you haven't done so already, you can generate a new one -# The key must be passed as argument -export ZITADEL_MASTERKEY="$(tr -dc A-Za-z0-9 ./zitadel-masterkey # Let the zitadel binary read configuration from environment variables -zitadel start-from-init --masterkey "${ZITADEL_MASTERKEY}" --tlsMode disabled +zitadel start-from-init --masterkey "${ZITADEL_MASTERKEY}" --tlsMode disabled --masterkeyFile ./zitadel-masterkey ```