diff --git a/env/development/.env.administration b/env/development/.env.administration index bea518f..f404684 100644 --- a/env/development/.env.administration +++ b/env/development/.env.administration @@ -1,2 +1,2 @@ PORTAINER_IMAGE=portainer/portainer-ce:latest -PORTAINER_DATA_PATH=./../../volumes/administration/portainer/data +PORTAINER_DATA_PATH=../../../volumes/administration/portainer/data diff --git a/env/development/.env.backend b/env/development/.env.backend index baabdec..5eee0e5 100644 --- a/env/development/.env.backend +++ b/env/development/.env.backend @@ -6,35 +6,21 @@ REDIS_PASSWORD=laravel-redis-passwort REDIS_PORT=6379 -# ---------------------------------- -# Vue Frontend (Nuxt.js) -# ---------------------------------- -VUE_APP_BACKEND_HOST_ADDRESS=https://dev.b.mindboost.team -VUE_INTERNAL_PORT=3000 -VUE_FRONTEND_DOMAIN_1=app.mindboost.team -VUE_FRONTEND_DOMAIN_2=mindboost.app - # ---------------------------------- # Laravel Backend # ---------------------------------- BACKEND_NETWORK=backend APP_NAME="mindboost backend - Compose Deployment" -APP_URL=https://b.mindboost.team +APP_URL=https://backend.local LARAVEL_PORT=8000 LARAVEL_VITE_PORT=5173 -DB_HOST=mariadb -DB_PORT=3306 -DB_PASSWORD=1stronges-mindboostdb-passwort -DB_USERNAME=mindboost -DB_DATABASE=mindboost +DB_HOST=${MARIADB_HOST} +DB_PORT=${MARIADB_PORT} +DB_PASSWORD=${MARIADB_PASSWORD} +DB_USERNAME=${MARIADB_USER} +DB_DATABASE=${MARIADB_DATABASE} JWT_SECRET=zMtO8sgsnc4UixWSsYWE1pK9EdpNLzxNSoIPlUpTe6dDlarM3bu4cwM80tH3jA0F -# ---------------------------------- -# Traefik -# ---------------------------------- -TRAEFIK_CERT_RESOLVER=http_resolver -TRAEFIK_ENTRYPOINT=websecure -TRAEFIK_NETWORK=proxy # ---------------------------------- # Adminer diff --git a/env/development/.env.database b/env/development/.env.database index 2544ad9..8604761 100644 --- a/env/development/.env.database +++ b/env/development/.env.database @@ -5,3 +5,6 @@ MARIADB_USER=${INFRASTRUCTURE_LABEL}_${ENVIRONMENT} MARIADB_DATABASE=${INFRASTRUCTURE_LABEL}_${ENVIRONMENT} MARIADB_PASSWORD=1stronges-mindboostdb-passwort MARIADB_ROOT_PASSWORD=1stronges-passwort-fuer-diedb + +MARIADB_PORT=3306 +MARIADB_HOST=${INFRASTRUCTURE_LABEL}_database_${ENVIRONMENT} diff --git a/env/development/.env.develop b/env/development/.env.develop index ec5c567..d0430b7 100644 --- a/env/development/.env.develop +++ b/env/development/.env.develop @@ -1,7 +1,18 @@ USER_UID=1000 USER_GID=1000 -GITEA__database__DB_TYPE=postgres -GITEA__database__HOST=db:5432 -GITEA__database__NAME=${GITEA_DB_NAME:-gitea} -GITEA__database__USER=${GITEA_DB_USER:-gitea} -GITEA__database__PASSWD=gitea-datenbank-passwort \ No newline at end of file + +GITEA_VOLUME_PATH=../../../volumes/develop/gitea/gitea +GITEA_DATABASE_VOLUME_PATH=../../../volumes/develop/gitea/gitea_db + +GITEA_MYSQL_ROOT_PASSWORD=very-difficult-passwort-gitea +GITEA_MYSQL_USER=gitea +GITEA_MYSQL_PASSWORD=very-difficult-gitea +GITEA_MYSQL_DATABASE=gitea +GITEA_MYSQL_ALLOW_EMPTY_PASSWORD=true + + +DB_HOST=gitea_db:3306 +DB_NAME=gitea +DB_PASSWD=very-difficult-gitea +DB_TYPE=mysql +DB_USER=gitea diff --git a/env/development/.env.proxy b/env/development/.env.proxy index 25cd183..07afbba 100644 --- a/env/development/.env.proxy +++ b/env/development/.env.proxy @@ -4,7 +4,7 @@ TRAEFIK_ENABLE=true TRAEFIK_NETWORK=proxy TRAEFIK_BASIC_AUTH_USERS=${ADMIN_USER}:${ADMIN_PASSWORD_HASH} -TRAEFIK_CERT_RESOLVER=http_resolver +TRAEFIK_CERT_RESOLVER= ## ## Domains when TRAEFIK is ENABLED @@ -18,6 +18,7 @@ GITEA_DOMAIN=gitea.local LIMESURVEY_DOMAIN=survey.local LINKSTACK_DOMAIN=linkstack.local TRAEFIK_DOMAIN=traefik.local +CLOUD_DOMAIN=cloud.local ### TLS for Domains PORTAINER_TLS_DOMAIN_MAIN=${PORTAINER_DOMAIN} @@ -29,14 +30,7 @@ GITEA_TLS_DOMAIN_MAIN=${GITEA_DOMAIN} LIMESURVEY_TLS_DOMAIN_MAIN=${LIMESURVEY_DOMAIN} LINKSTACK_TLS_DOMAIN_MAIN=${LINKSTACK_DOMAIN} TRAEFIK_TLS_DOMAIN_MAIN=${TRAEFIK_DOMAIN} - -FRONTEND_DOMAIN=frontend.local -BACKEND_DOMAIN=backend.local -WEBSITE_DOMAIN=web.local -GITEA_DOMAIN=gitea.local -LIMESURVEY_DOMAIN=survey.local -LINKSTACK_DOMAIN=linkstack.local -TRAEFIK_DOMAIN=traefik.local +CLOUD_TLS_DOMAIN_MAIN=${CLOUD_DOMAIN} ## ## MIDDLEWARES @@ -50,5 +44,5 @@ TRAEFIK_BASIC_AUTH_MIDDLEWARE=${INFRASTRUCTURE_LABEL}-basic-auth TRAEFIK_ENTRYPOINT=websecure TRAEFIK_ENTRYPOINT_HTTP=web -TRAEFIK_ENTRYPOINT_HTTP +