From 47c16983ac69f87f179d1d279149241b8010e704 Mon Sep 17 00:00:00 2001
From: David Zielezna <davidz@cti.ninja>
Date: Tue, 2 Dec 2025 15:01:27 +1100
Subject: [PATCH] separate email config elements

---
 core/files/configure_misp.sh | 8 ++++----
 core/files/entrypoint.sh     | 2 ++
 docker-compose.yml           | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/files/configure_misp.sh b/core/files/configure_misp.sh
index 26ffc6f1..498e89e7 100755
--- a/core/files/configure_misp.sh
+++ b/core/files/configure_misp.sh
@@ -7,8 +7,8 @@ source /utilities.sh
 # envsubst won't evaluate anything like $() or conditional variable expansion so lets do that here
 export PYTHON_BIN="$(which python3)"
 export GPG_BINARY="$(which gpg)"
-export SETTING_CONTACT="${MISP_CONTACT-$ADMIN_EMAIL}"
-export SETTING_EMAIL="${MISP_EMAIL-$ADMIN_EMAIL}"
+export SETTING_CONTACT="${MISP_CONTACT}"
+export SETTING_EMAIL="${MISP_EMAIL}"
 
 init_minimum_config() {
     # Temporarily disable DB to apply config file settings, reenable after if needed 
@@ -43,7 +43,7 @@ configure_gnupg() {
 Key-Type: RSA
 Key-Length: 3072
 Name-Real: MISP Admin
-Name-Email: ${MISP_EMAIL-$ADMIN_EMAIL}
+Name-Email: ${MISP_EMAIL}
 Expire-Date: 0
 Passphrase: $GPG_PASSPHRASE
 %commit
@@ -63,7 +63,7 @@ GPGEOF
 
     if [ ! -f ${GPG_ASC} ]; then
         echo "... exporting GPG key"
-        sudo -u www-data gpg --homedir ${GPG_DIR} --export --armor ${MISP_EMAIL-$ADMIN_EMAIL} > ${GPG_ASC}
+        sudo -u www-data gpg --homedir ${GPG_DIR} --export --armor ${MISP_EMAIL} > ${GPG_ASC}
     else
         echo "... found exported key ${GPG_ASC}"
     fi
diff --git a/core/files/entrypoint.sh b/core/files/entrypoint.sh
index 87079687..14ca020d 100755
--- a/core/files/entrypoint.sh
+++ b/core/files/entrypoint.sh
@@ -44,6 +44,8 @@ export CRON_PULLALL=${CRON_PULLALL:-86400}
 export CRON_PUSHALL=${CRON_PUSHALL:-86400}
 
 export ADMIN_EMAIL=${ADMIN_EMAIL:-admin@admin.test}
+export MISP_CONTACT=${MISP_CONTACT:-$ADMIN_EMAIL}
+export MISP_EMAIL=${MISP_EMAIL:-$ADMIN_EMAIL}
 export GPG_PASSPHRASE=${GPG_PASSPHRASE:-passphrase}
 export MISP_MODULES_FQDN=${MISP_MODULES_FQDN:-http://misp-modules}
 export ATTACHMENTS_DIR=${ATTACHMENTS_DIR:-/var/www/MISP/app/files}
diff --git a/docker-compose.yml b/docker-compose.yml
index 64213a2f..8e37b833 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -144,6 +144,8 @@ services:
       - "DISABLE_PRINTING_PLAINTEXT_CREDENTIALS=${DISABLE_PRINTING_PLAINTEXT_CREDENTIALS}"
       # standard settings
       - "ADMIN_EMAIL=${ADMIN_EMAIL}"
+      - "MISP_CONTACT=${MISP_CONTACT}"
+      - "MISP_EMAIL=${MISP_EMAIL}"
       - "ADMIN_PASSWORD=${ADMIN_PASSWORD}"
       - "ADMIN_KEY=${ADMIN_KEY}"
       - "ADMIN_ORG=${ADMIN_ORG}"