From d4abe64b0b6c00be40b9f836cfcc4b1f98430640 Mon Sep 17 00:00:00 2001 From: rorapp Date: Fri, 28 Feb 2025 18:08:52 +0100 Subject: [PATCH] changes in development environtments --- env/development/.env.backend | 17 +++++++++++------ env/development/.env.database | 7 +------ env/development/.env.proxy | 5 +++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/env/development/.env.backend b/env/development/.env.backend index 8f1d6cb..a0fcfaf 100644 --- a/env/development/.env.backend +++ b/env/development/.env.backend @@ -11,16 +11,21 @@ SERVER_IP=${SERVER_IP:-localhost} # Laravel Backend # ---------------------------------- BACKEND_NETWORK=backend +APP_ENV=${ENVIRONMENT-local} APP_NAME="mindboost backend - Compose Deployment" APP_URL=https://backend.local LARAVEL_PORT=8000 LARAVEL_VITE_PORT=5173 -DB_HOST=${MARIADB_HOST:-database} -DB_PORT=${MARIADB_PORT:-3306} -DB_PASSWORD=${MARIADB_PASSWORD:-default} -DB_USERNAME=${MARIADB_USER:-default} -DB_DATABASE=${MARIADB_DATABASE:-default} - JWT_SECRET=zMtO8sgsnc4UixWSsYWE1pK9EdpNLzxNSoIPlUpTe6dDlarM3bu4cwM80tH3jA0F +# ---------------------------------- +# Datenbank Zugriff - ! MUSS MIT .env.database übereinstimmen +# ---------------------------------- +DB_HOST=database +DB_PORT=3306 +DB_PASSWORD=1stronges-mindboostdb-passwort +DB_USERNAME=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} +DB_DATABASE=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} + + diff --git a/env/development/.env.database b/env/development/.env.database index ca4d94b..ddaad30 100644 --- a/env/development/.env.database +++ b/env/development/.env.database @@ -3,12 +3,7 @@ # ---------------------------------- MARIADB_USER=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} MARIADB_DATABASE=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} +MARIADB_ROOT_PASSWORD_FILE=/run/secrets/mariadb_root MARIADB_PASSWORD=1stronges-mindboostdb-passwort -MARIADB_RANDOM_ROOT_PASSWORD=1 MARIADB_PORT=3306 MARIADB_HOST=database - -# ---------------------------------- -# Adminer -# ---------------------------------- -ADMINER_PORT=8082 diff --git a/env/development/.env.proxy b/env/development/.env.proxy index 3b1fdb6..9aaf065 100644 --- a/env/development/.env.proxy +++ b/env/development/.env.proxy @@ -1,8 +1,8 @@ # ---------------------------------- # TRAEFIK # ---------------------------------- - -TRAEFIK_ENABLE=false + +TRAEFIK_ENABLE=true TRAEFIK_NETWORK=proxy TRAEFIK_BASIC_AUTH_USERS=${ADMIN_USER}:${ADMIN_PASSWORD_HASH} TRAEFIK_CERT_RESOLVER= @@ -14,6 +14,7 @@ FRONTEND_DOMAIN=frontend.local FRONTEND_DOMAIN_2=app.frontend.local BACKEND_DOMAIN=backend.local WEBSITE_DOMAIN=web.local +ADMINER_DOMAIN=adminer.local GITEA_DOMAIN=gitea.local LIMESURVEY_DOMAIN=survey.local LINKSTACK_DOMAIN=linkstack.local