diff --git a/backend/.env.dist b/backend/.env.dist index 69b1d6a46..06e0c3a64 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,4 +1,4 @@ -CONFIG_VERSION=v9.2022-07-07 +CONFIG_VERSION=v10.2022-09-20 # Server PORT=4000 @@ -37,6 +37,8 @@ LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a # EMail EMAIL=false +EMAIL_TEST_MODUS=false +EMAIL_TEST_RECEIVER=test_team@gradido.net EMAIL_USERNAME=gradido_email EMAIL_SENDER=info@gradido.net EMAIL_PASSWORD=xxx diff --git a/backend/.env.template b/backend/.env.template index beaa256ef..bace78673 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -5,6 +5,7 @@ JWT_SECRET=$JWT_SECRET JWT_EXPIRES_IN=$JWT_EXPIRES_IN GRAPHIQL=false GDT_API_URL=$GDT_API_URL +ENV_NAME=$ENV_NAME # Database DB_HOST=localhost @@ -36,6 +37,8 @@ LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a # EMail EMAIL=$EMAIL +EMAIL_TEST_MODUS=$EMAIL_TEST_MODUS +EMAIL_TEST_RECEIVER=$EMAIL_TEST_RECEIVER EMAIL_USERNAME=$EMAIL_USERNAME EMAIL_SENDER=$EMAIL_SENDER EMAIL_PASSWORD=$EMAIL_PASSWORD diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 50d68d726..462620b14 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -15,10 +15,9 @@ const constants = { LOG4JS_CONFIG: 'log4js-config.json', // default log level on production should be info LOG_LEVEL: process.env.LOG_LEVEL || 'info', - EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || 'false', CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v9.2022-07-07', + EXPECTED: 'v10.2022-09-20', CURRENT: '', }, } @@ -69,6 +68,7 @@ const loginServer = { const email = { EMAIL: process.env.EMAIL === 'true' || false, + EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || 'false', EMAIL_TEST_RECEIVER: process.env.EMAIL_TEST_RECEIVER || 'test_team@gradido.net', EMAIL_USERNAME: process.env.EMAIL_USERNAME || 'gradido_email', EMAIL_SENDER: process.env.EMAIL_SENDER || 'info@gradido.net', diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index ebb6717e7..b090908e1 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -26,10 +26,11 @@ COMMUNITY_REDEEM_CONTRIBUTION_URL=https://stage1.gradido.net/redeem/CL-{code} COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community" # backend -BACKEND_CONFIG_VERSION=v9.2022-07-07 +BACKEND_CONFIG_VERSION=v10.2022-09-20 JWT_EXPIRES_IN=10m GDT_API_URL=https://gdt.gradido.net +ENV_NAME=stage1 TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log @@ -40,6 +41,8 @@ KLICKTIPP_APIKEY_DE= KLICKTIPP_APIKEY_EN= EMAIL=true +EMAIL_TEST_MODUS=false +EMAIL_TEST_RECEIVER=test_team@gradido.net EMAIL_USERNAME=peter@lustig.de EMAIL_SENDER=peter@lustig.de EMAIL_PASSWORD=1234