From de65a380ab5cd0114c78918cd3e8d5853f2d59af Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Sep 2025 11:47:29 +0200 Subject: [PATCH] fix(backend): fix naming of PRIVATEKEY (#8905) --- backend/.env.template | 2 +- backend/.env.test_e2e | 2 +- backend/src/config/index.ts | 6 +++--- deployment/TODO-next-update.md | 2 +- deployment/deployment-values.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/.env.template b/backend/.env.template index 954fe8c4c..f8187b0ca 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -19,7 +19,7 @@ SMTP_PASSWORD= SMTP_SECURE="false" # true for 465, false for other ports SMTP_DKIM_DOMAINNAME= SMTP_DKIM_KEYSELECTOR= -SMTP_DKIM_PRIVATKEY= +SMTP_DKIM_PRIVATEKEY= # E-Mail settings for our 'docker compose up mailserver' # SMTP_HOST=localhost # SMTP_PORT=1025 diff --git a/backend/.env.test_e2e b/backend/.env.test_e2e index a5f09eae4..feadc874a 100644 --- a/backend/.env.test_e2e +++ b/backend/.env.test_e2e @@ -19,7 +19,7 @@ SMTP_PASSWORD= SMTP_SECURE="false" # true for 465, false for other ports SMTP_DKIM_DOMAINNAME= SMTP_DKIM_KEYSELECTOR= -SMTP_DKIM_PRIVATKEY= +SMTP_DKIM_PRIVATEKEY= JWT_SECRET="b/&&7b78BF&fv/Vd" JWT_EXPIRES="2y" diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index cf93ef92c..dedff2d94 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -48,7 +48,7 @@ const SMTP_PASSWORD = env.SMTP_PASSWORD const SMTP_DKIM_DOMAINNAME = env.SMTP_DKIM_DOMAINNAME const SMTP_DKIM_KEYSELECTOR = env.SMTP_DKIM_KEYSELECTOR // PEM format = https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/PEM-file-format.html -const SMTP_DKIM_PRIVATKEY = env.SMTP_DKIM_PRIVATKEY?.replace(/\\n/g, '\n') // replace all "\n" in .env string by real line break +const SMTP_DKIM_PRIVATEKEY = env.SMTP_DKIM_PRIVATEKEY?.replace(/\\n/g, '\n') // replace all "\n" in .env string by real line break const SMTP_MAX_CONNECTIONS = (env.SMTP_MAX_CONNECTIONS && parseInt(env.SMTP_MAX_CONNECTIONS)) || 5 const SMTP_MAX_MESSAGES = (env.SMTP_MAX_MESSAGES && parseInt(env.SMTP_MAX_MESSAGES)) || 100 @@ -67,11 +67,11 @@ if (SMTP_USERNAME && SMTP_PASSWORD) { pass: SMTP_PASSWORD, } } -if (SMTP_DKIM_DOMAINNAME && SMTP_DKIM_KEYSELECTOR && SMTP_DKIM_PRIVATKEY) { +if (SMTP_DKIM_DOMAINNAME && SMTP_DKIM_KEYSELECTOR && SMTP_DKIM_PRIVATEKEY) { nodemailerTransportOptions.dkim = { domainName: SMTP_DKIM_DOMAINNAME, keySelector: SMTP_DKIM_KEYSELECTOR, - privateKey: SMTP_DKIM_PRIVATKEY, + privateKey: SMTP_DKIM_PRIVATEKEY, } } diff --git a/deployment/TODO-next-update.md b/deployment/TODO-next-update.md index ae1cae4dc..617a518cd 100644 --- a/deployment/TODO-next-update.md +++ b/deployment/TODO-next-update.md @@ -24,7 +24,7 @@ The default value is `neo4j` if it is not set. - We have the new option to configure DKIM for sent e-mails in environment variables (`.env`, `docker-compose.yml` or `values.yaml`), see [deployment-values.md](deployment-values.md): - `SMTP_DKIM_DOMAINNAME=` - `SMTP_DKIM_KEYSELECTOR=` - - `SMTP_DKIM_PRIVATKEY=` + - `SMTP_DKIM_PRIVATEKEY=` ## Version >= 2.7.0 with 'ocelotDockerVersionTag' 2.7.0-470 diff --git a/deployment/deployment-values.md b/deployment/deployment-values.md index 96e5770fa..e2ff908c7 100644 --- a/deployment/deployment-values.md +++ b/deployment/deployment-values.md @@ -37,7 +37,7 @@ However, if you need DKIM authorization and verification, you must set the appro ```bash SMTP_DKIM_DOMAINNAME= SMTP_DKIM_KEYSELECTOR=ocelot # "free" name used in DNS as selector. we recommend this -SMTP_DKIM_PRIVATKEY="-----BEGIN RSA PRIVATE KEY-----\\n\\n-----END RSA PRIVATE KEY-----\\n" +SMTP_DKIM_PRIVATEKEY="-----BEGIN RSA PRIVATE KEY-----\\n\\n-----END RSA PRIVATE KEY-----\\n" ``` You can find out how DKIM works here: