From 65ba4cb54bf970a9116ab3e333d0e264f8f90263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20K=C3=B6nig?= <83813381+derkoenigeu@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:01:07 +0200 Subject: [PATCH] [bitnami/matomo] added optional env variables to set noreply name and address (#35280) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added optional env variables to set noreply name and address Signed-off-by: Jonas König Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com> Signed-off-by: Jonas König * changed noreply description to newline to satisfy linter Signed-off-by: Jonas König Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com> Signed-off-by: Jonas König * 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 * Meet common practices Signed-off-by: Andrés Bono --------- Signed-off-by: Jonas König Signed-off-by: Jonas König <83813381+derkoenigeu@users.noreply.github.com> Signed-off-by: Jonas König Signed-off-by: Andrés Bono Co-authored-by: Andrés Bono --- .../4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh | 7 +++++++ .../4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh | 4 ++++ bitnami/matomo/README.md | 2 ++ 3 files changed, 13 insertions(+) diff --git a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh index ab1f6b71357e..0f6de6a9f29b 100644 --- a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh +++ b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/libmatomo.sh @@ -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" diff --git a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh index 6b324f94930a..73e0a187b680 100644 --- a/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh +++ b/bitnami/matomo/4/debian-11/rootfs/opt/bitnami/scripts/matomo-env.sh @@ -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 diff --git a/bitnami/matomo/README.md b/bitnami/matomo/README.md index fe72de725fbb..8c0d389f9117 100644 --- a/bitnami/matomo/README.md +++ b/bitnami/matomo/README.md @@ -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