Skip to content

#318 separate email config elements #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ostefano merged 1 commit into from
Dec 4, 2025
Merged

#318 separate email config elements #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/files/configure_misp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions core/files/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down