diff --git a/backend/UniVerse.Api/appsettings.Development.json b/backend/UniVerse.Api/appsettings.Development.json index 3e1a225..511304d 100644 --- a/backend/UniVerse.Api/appsettings.Development.json +++ b/backend/UniVerse.Api/appsettings.Development.json @@ -4,5 +4,15 @@ "Default": "Information", "Microsoft.AspNetCore": "Information" } + }, + "ConnectionStrings": { + "DefaultConnection": "Host=db;Port=5444;Database=universe;Username=universe;Password=pass" + }, + "Jwt": { + "Secret": "default-dev-secret-key-change-in-production-32chars!!", + "Issuer": "UniVerse", + "Audience": "UniVerse", + "AccessTokenExpirationMinutes": "30", + "RefreshTokenExpirationDays": "30" } } diff --git a/backend/UniVerse.Api/appsettings.json b/backend/UniVerse.Api/appsettings.json index 461626d..0844925 100644 --- a/backend/UniVerse.Api/appsettings.json +++ b/backend/UniVerse.Api/appsettings.json @@ -7,16 +7,6 @@ } }, "AllowedHosts": "*", - "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Port=5432;Database=universe;Username=postgres;Password=postgres" - }, - "Jwt": { - "Secret": "default-dev-secret-key-change-in-production-32chars!!", - "Issuer": "UniVerse", - "Audience": "UniVerse", - "AccessTokenExpirationMinutes": "30", - "RefreshTokenExpirationDays": "30" - }, "Cors": { "Origins": [ "http://localhost:5173", @@ -39,8 +29,8 @@ "MinimumLevel": { "Default": "Information", "Override": { - "Microsoft": "Warning", - "System": "Warning" + "Microsoft": "Information", + "System": "Information" } } } diff --git a/backend/docker-compose-prod.yml b/backend/docker-compose-prod.yml index e9f40dd..4f21a13 100644 --- a/backend/docker-compose-prod.yml +++ b/backend/docker-compose-prod.yml @@ -30,7 +30,7 @@ services: - ModeusApi:BaseUrl=${MODEUS_API_BASE_URL} - ModeusApi:ApiKey=${MODEUS_API_KEY} - - Gamification:XpThresholds=${GAMIFICATION_XP_THRESHOLDS:[0, 100, 300, 600, 1000, 1500, 2500, 4000]} + - Gamification:XpThresholds=${GAMIFICATION_XP_THRESHOLDS:-[0, 100, 300, 600, 1000, 1500, 2500, 4000]} - ConnectionStrings:DefaultConnection=Host=db;Port=5432;Database=${POSTGRES_DATABASE:-universe};Username=${POSTGRES_USER};Password=${POSTGRES_PASSWORD} networks: diff --git a/backend/docker-compose-test.yml b/backend/docker-compose-test.yml index 86ec590..6513329 100644 --- a/backend/docker-compose-test.yml +++ b/backend/docker-compose-test.yml @@ -8,6 +8,7 @@ services: ports: - "8088:8080" environment: + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true - AzureAd:Instance=${AzureAd_Instance:-https://login.microsoftonline.com/} @@ -32,7 +33,7 @@ services: - ModeusApi:BaseUrl=${MODEUS_API_BASE_URL} - ModeusApi:ApiKey=${MODEUS_API_KEY} - - Gamification:XpThresholds=${GAMIFICATION_XP_THRESHOLDS:[0, 100, 300, 600, 1000, 1500, 2500, 4000]} + - Gamification:XpThresholds=${GAMIFICATION_XP_THRESHOLDS:-[0, 100, 300, 600, 1000, 1500, 2500, 4000]} - ConnectionStrings:DefaultConnection=Host=db;Port=5432;Database=${POSTGRES_DATABASE};Username=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}