From 97b28e9540146307fde38178c8366138843d1951 Mon Sep 17 00:00:00 2001 From: rorapp Date: Tue, 18 Feb 2025 17:35:44 +0100 Subject: [PATCH] updated formattings of env files --- env/development/.env.administration | 5 +++++ env/development/.env.backend | 12 ++++++------ env/development/.env.database | 6 +++--- env/development/.env.develop | 7 +++++++ env/development/.env.frontend | 6 +++++- env/development/.env.proxy | 28 ++++++++++++++-------------- env/development/.env.tools | 21 +++++++++++++++++++++ env/development/.env.website | 5 +++++ 8 files changed, 66 insertions(+), 24 deletions(-) diff --git a/env/development/.env.administration b/env/development/.env.administration index f404684..431f787 100644 --- a/env/development/.env.administration +++ b/env/development/.env.administration @@ -1,2 +1,7 @@ +# ---------------------------------- +# Portainer +# ---------------------------------- + PORTAINER_IMAGE=portainer/portainer-ce:latest PORTAINER_DATA_PATH=../../../volumes/administration/portainer/data + diff --git a/env/development/.env.backend b/env/development/.env.backend index 5eee0e5..a22da33 100644 --- a/env/development/.env.backend +++ b/env/development/.env.backend @@ -5,7 +5,7 @@ # ---------------------------------- REDIS_PASSWORD=laravel-redis-passwort REDIS_PORT=6379 - +SERVER_IP=${SERVER_IP:-localhost} # ---------------------------------- # Laravel Backend # ---------------------------------- @@ -14,11 +14,11 @@ APP_NAME="mindboost backend - Compose Deployment" APP_URL=https://backend.local LARAVEL_PORT=8000 LARAVEL_VITE_PORT=5173 -DB_HOST=${MARIADB_HOST} -DB_PORT=${MARIADB_PORT} -DB_PASSWORD=${MARIADB_PASSWORD} -DB_USERNAME=${MARIADB_USER} -DB_DATABASE=${MARIADB_DATABASE} +DB_HOST=${MARIADB_HOST:-mariadb} +DB_PORT=${MARIADB_PORT:-3306} +DB_PASSWORD=${MARIADB_PASSWORD:-default} +DB_USERNAME=${MARIADB_USER:-default} +DB_DATABASE=${MARIADB_DATABASE:-default} JWT_SECRET=zMtO8sgsnc4UixWSsYWE1pK9EdpNLzxNSoIPlUpTe6dDlarM3bu4cwM80tH3jA0F diff --git a/env/development/.env.database b/env/development/.env.database index 8604761..b141c9a 100644 --- a/env/development/.env.database +++ b/env/development/.env.database @@ -1,10 +1,10 @@ # ---------------------------------- # Datenbank (MariaDB) # ---------------------------------- -MARIADB_USER=${INFRASTRUCTURE_LABEL}_${ENVIRONMENT} -MARIADB_DATABASE=${INFRASTRUCTURE_LABEL}_${ENVIRONMENT} +MARIADB_USER=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} +MARIADB_DATABASE=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development} MARIADB_PASSWORD=1stronges-mindboostdb-passwort MARIADB_ROOT_PASSWORD=1stronges-passwort-fuer-diedb MARIADB_PORT=3306 -MARIADB_HOST=${INFRASTRUCTURE_LABEL}_database_${ENVIRONMENT} +MARIADB_HOST=${INFRASTRUCTURE_LABEL:-default}_database_${ENVIRONMENT:-development} diff --git a/env/development/.env.develop b/env/development/.env.develop index d0430b7..a37a4e7 100644 --- a/env/development/.env.develop +++ b/env/development/.env.develop @@ -1,3 +1,7 @@ +# ---------------------------------- +# GITEA +# ---------------------------------- + USER_UID=1000 USER_GID=1000 @@ -10,6 +14,9 @@ GITEA_MYSQL_PASSWORD=very-difficult-gitea GITEA_MYSQL_DATABASE=gitea GITEA_MYSQL_ALLOW_EMPTY_PASSWORD=true +# ---------------------------------- +# GITEA DB +# ---------------------------------- DB_HOST=gitea_db:3306 DB_NAME=gitea diff --git a/env/development/.env.frontend b/env/development/.env.frontend index 986524d..dc87f64 100644 --- a/env/development/.env.frontend +++ b/env/development/.env.frontend @@ -1 +1,5 @@ -# Frontend +# ---------------------------------- +# VUE APP +# ---------------------------------- + +BACKEND_URL="backend.local" \ No newline at end of file diff --git a/env/development/.env.proxy b/env/development/.env.proxy index 07afbba..7e6c32c 100644 --- a/env/development/.env.proxy +++ b/env/development/.env.proxy @@ -1,14 +1,14 @@ -## -## GENERAL -## -TRAEFIK_ENABLE=true +# ---------------------------------- +# TRAEFIK +# ---------------------------------- + +TRAEFIK_ENABLE=false TRAEFIK_NETWORK=proxy TRAEFIK_BASIC_AUTH_USERS=${ADMIN_USER}:${ADMIN_PASSWORD_HASH} TRAEFIK_CERT_RESOLVER= -## ## Domains when TRAEFIK is ENABLED -## + PORTAINER_DOMAIN=portainer.local FRONTEND_DOMAIN=frontend.local FRONTEND_DOMAIN_2=app.frontend.local @@ -20,7 +20,8 @@ LINKSTACK_DOMAIN=linkstack.local TRAEFIK_DOMAIN=traefik.local CLOUD_DOMAIN=cloud.local -### TLS for Domains +### TLS for Domains + PORTAINER_TLS_DOMAIN_MAIN=${PORTAINER_DOMAIN} FRONTEND_TLS_DOMAIN_MAIN=${FRONTEND_DOMAIN} FRONTEND_TLS_DOMAIN_SANS=${FRONTEND_DOMAIN_2} @@ -32,15 +33,14 @@ LINKSTACK_TLS_DOMAIN_MAIN=${LINKSTACK_DOMAIN} TRAEFIK_TLS_DOMAIN_MAIN=${TRAEFIK_DOMAIN} CLOUD_TLS_DOMAIN_MAIN=${CLOUD_DOMAIN} -## -## MIDDLEWARES -## -TRAEFIK_HTTPS_REDIRECT_MIDDLEWARE=${INFRASTRUCTURE_LABEL}-https-redirect -TRAEFIK_BASIC_AUTH_MIDDLEWARE=${INFRASTRUCTURE_LABEL}-basic-auth -## +## MIDDLEWARES + +TRAEFIK_HTTPS_REDIRECT_MIDDLEWARE=${INFRASTRUCTURE_LABEL:-default}-https-redirect +TRAEFIK_BASIC_AUTH_MIDDLEWARE=${INFRASTRUCTURE_LABEL:-default}-basic-auth + + ## ENTRYPOINTS -## TRAEFIK_ENTRYPOINT=websecure TRAEFIK_ENTRYPOINT_HTTP=web diff --git a/env/development/.env.tools b/env/development/.env.tools index e69de29..cb0a5b7 100644 --- a/env/development/.env.tools +++ b/env/development/.env.tools @@ -0,0 +1,21 @@ +# ---------------------------------- +# NEXTCLOUD DB +# ---------------------------------- + +MYSQL_ROOT_PASSWORD=headpiece-constant1-denim-mindboost #SQL root Passwort eingeben +MYSQL_PASSWORD=idealist9-frayed-murkiness-mindboost #SQL Benutzer Passwort eingeben +MYSQL_DATABASE=nextcloud-mindboost #Datenbank Name +MYSQL_USER=mindboostcloud #SQL Nutzername +MYSQL_INITDB_SKIP_TZINFO=1 +MARIADB_AUTO_UPGRADE=1 + +# ---------------------------------- +# NEXTCLOUD CLOUD +# ---------------------------------- + +TRUSTED_PROXIES=172.16.255.254/16 +OVERWRITEPROTOCOL=https +OVERWRITECLIURL=https://${CLOUD_DOMAIN:-cloud} +OVERWRITEHOST=${CLOUD_DOMAIN:-cloud} +REDIS_HOST=nextcloud-redis +REDIS_HOST_PASSWORD=redis-mindboost-passwort diff --git a/env/development/.env.website b/env/development/.env.website index e69de29..ae2e104 100644 --- a/env/development/.env.website +++ b/env/development/.env.website @@ -0,0 +1,5 @@ +# ---------------------------------- +# KIRBY CMS +# ---------------------------------- + +USER_ID=0 \ No newline at end of file