Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-15 06:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/matomo] added optional env variables to set noreply name and address (#35280)

Browse Source 
* added optional env variables to set noreply name and address

Signed-off-by: Jonas König<jonas.koenig@mindbox.de>
Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com>
Signed-off-by: Jonas König <jonas.koenig@mindbox.de>

* changed noreply description to newline to satisfy linter

Signed-off-by: Jonas König<jonas.koenig@mindbox.de>
Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com>
Signed-off-by: Jonas König <jonas.koenig@mindbox.de>

* moved noreply mail settings up to smtp if/else since it won't work anyways when smtp is not set

Signed-off-by: Jonas König <jonas.koenig@mindbox.de>

* Meet common practices

Signed-off-by: Andrés Bono <andresbono@vmware.com>

---------

Signed-off-by: Jonas König<jonas.koenig@mindbox.de>
Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com>
Signed-off-by: Jonas König <jonas.koenig@mindbox.de>
Signed-off-by: Andrés Bono <andresbono@vmware.com>
Co-authored-by: Andrés Bono <andresbono@vmware.com>
This commit is contained in:
Jonas König
2023-06-05 14:01:07 +02:00
committed by GitHub
parent 8072e03845
commit 65ba4cb54b
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh
View File

@@ -202,6 +202,13 @@ EOF
ini-file set -s "mail" -k "password" -v "$MATOMO_SMTP_PASSWORD" "$MATOMO_CONF_FILE"
ini-file set -s "mail" -k "type" -v "$MATOMO_SMTP_AUTH" "$MATOMO_CONF_FILE"
ini-file set -s "mail" -k "encryption" -v "$MATOMO_SMTP_PROTOCOL" "$MATOMO_CONF_FILE"
# Optional noreply name and address
if ! is_empty_value "$MATOMO_NOREPLY_NAME"; then
ini-file set -s "General" -k "noreply_email_name" -v "$MATOMO_NOREPLY_NAME" "$MATOMO_CONF_FILE"
fi
if ! is_empty_value "$MATOMO_NOREPLY_ADDRESS"; then
ini-file set -s "General" -k "noreply_email_address" -v "$MATOMO_NOREPLY_ADDRESS" "$MATOMO_CONF_FILE"
fi
fi
info "Persisting Matomo installation"

4
bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh
View File

@@ -47,6 +47,8 @@ matomo_env_vars=(
MATOMO_SMTP_PASSWORD
MATOMO_SMTP_AUTH
MATOMO_SMTP_PROTOCOL
MATOMO_NOREPLY_NAME
MATOMO_NOREPLY_ADDRESS
MATOMO_DATABASE_HOST
MATOMO_DATABASE_PORT_NUMBER
MATOMO_DATABASE_NAME
@@ -121,6 +123,8 @@ MATOMO_SMTP_AUTH="${MATOMO_SMTP_AUTH:-"${SMTP_AUTH:-}"}"
export MATOMO_SMTP_AUTH="${MATOMO_SMTP_AUTH:-}" # only used during the first initialization
MATOMO_SMTP_PROTOCOL="${MATOMO_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}"
export MATOMO_SMTP_PROTOCOL="${MATOMO_SMTP_PROTOCOL:-}" # only used during the first initialization
export MATOMO_NOREPLY_NAME="${MATOMO_NOREPLY_NAME:-}" # only used during the first initialization
export MATOMO_NOREPLY_ADDRESS="${MATOMO_NOREPLY_ADDRESS:-}" # only used during the first initialization
# Database configuration
export MATOMO_DEFAULT_DATABASE_HOST="mariadb" # only used at build time

2
bitnami/matomo/README.md
View File

@@ -369,6 +369,8 @@ To configure Matomo to send email using SMTP you can set the following environme
* `MATOMO_SMTP_PASSWORD`: Matomo SMTP account password.
* `MATOMO_SMTP_PROTOCOL`: Matomo SMTP protocol to use. Available protocols are: "ssl", "tls", "none". No default.
* `MATOMO_SMTP_AUTH`: Matomo SMTP authentication mechanism to use. Available mechanisms are: "Plain", "Login", "Crammd5". Default: **Plain**.
* `MATOMO_NOREPLY_NAME`: Matomo noreply name. No defaults.
* `MATOMO_NOREPLY_ADDRESS`: Matomo noreply address. No defaults.
##### SMTP example