From 6a09e9a984bae324047fc801f358c7386b51f26b Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Fri, 20 Oct 2023 21:52:12 +0200 Subject: [PATCH] fix: Make default admin environment variables optional Closes #526 --- docker-compose.yml | 13 +++++++------ server/.env.sample | 12 +++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0559fc42..080ab3a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,15 +20,11 @@ services: - 3000:1337 environment: - BASE_URL=http://localhost:3000 - - TRUST_PROXY=0 - DATABASE_URL=postgresql://postgres@postgres/planka - SECRET_KEY=notsecretkey - # Can be removed after installation - - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted - - DEFAULT_ADMIN_PASSWORD=demo - - DEFAULT_ADMIN_NAME=Demo Demo - - DEFAULT_ADMIN_USERNAME=demo + # - TRUST_PROXY=0 + # - TOKEN_EXPIRES_IN=365 # In days # related: https://github.com/knex/knex/issues/2354 # As knex does not pass query parameters from the connection string we @@ -38,6 +34,11 @@ services: # Configure knex to accept SSL certificates # - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false + # - DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted + # - DEFAULT_ADMIN_PASSWORD=demo + # - DEFAULT_ADMIN_NAME=Demo Demo + # - DEFAULT_ADMIN_USERNAME=demo + # - OIDC_ISSUER= # - OIDC_CLIENT_ID= # - OIDC_CLIENT_SECRET= diff --git a/server/.env.sample b/server/.env.sample index 2f61e7ce..699c5938 100644 --- a/server/.env.sample +++ b/server/.env.sample @@ -4,13 +4,6 @@ BASE_URL=http://localhost:1337 DATABASE_URL=postgresql://postgres@localhost/planka SECRET_KEY=notsecretkey -## Can be removed after installation - -DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted -DEFAULT_ADMIN_PASSWORD=demo -DEFAULT_ADMIN_NAME=Demo Demo -DEFAULT_ADMIN_USERNAME=demo - ## Optional # TRUST_PROXY=0 @@ -24,6 +17,11 @@ DEFAULT_ADMIN_USERNAME=demo # Configure knex to accept SSL certificates # KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false +# DEFAULT_ADMIN_EMAIL=demo@demo.demo # Do not remove if you want to prevent this user from being edited/deleted +# DEFAULT_ADMIN_PASSWORD=demo +# DEFAULT_ADMIN_NAME=Demo Demo +# DEFAULT_ADMIN_USERNAME=demo + # OIDC_ISSUER= # OIDC_CLIENT_ID= # OIDC_CLIENT_SECRET=