[bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460) (#77036)

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr
Remove MATOMO_TRACKER_FILE variable

* Remove trailing space in ReadMe.md
Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr

* [bitnami/acmesolver] Release acmesolver-1.17.0-debian-12-r1 (#76860)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr
Remove MATOMO_TRACKER_FILE variable

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Remove trailing space in ReadMe.md
Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/cassandra] Release cassandra-5.0.3-debian-12-r0 (#76855)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/argo-cd] Release argo-cd-2.14.1-debian-12-r0 (#76856)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/concourse] Release concourse-7.12.1-debian-12-r1 (#76857)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/minio-client] Release minio-client-2025.2.4-debian-12-r0 (#76858)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/minio] Release minio-2025.2.3-debian-12-r0 (#76859)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/acmesolver] Release acmesolver-1.17.0-debian-12-r1 (#76860)

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* [bitnami/matomo] Exclude matomo.js from being rsynced (issue #76460)
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr
Remove MATOMO_TRACKER_FILE variable

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Remove trailing space in ReadMe.md
Signed-off-by: Bénédicte Martinez benedicte.martinez@cea.fr

Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

* Change name variable
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>

---------

Signed-off-by: Bitnami Bot <bitnami-bot@vmware.com>
Signed-off-by: Bénédicte Martinez <benedicte.martinez@cea.fr>
Co-authored-by: Bitnami Bot <bitnami-bot@vmware.com>
This commit is contained in:
benemart 2025-02-12 13:31:16 +01:00 committed by GitHub
parent bd257e9b78
commit 5bbfae3df7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions

View File

@ -218,7 +218,14 @@ EOF
else
info "Persisted Matomo installation detected"
info "Updating Matomo files in persisted data"
rsync -a "$MATOMO_BASE_DIR"/* "$MATOMO_VOLUME_DIR" --exclude "$(realpath --relative-to="$MATOMO_BASE_DIR" "$MATOMO_CONF_FILE")"
rsync_args=("-a" "$MATOMO_BASE_DIR"/* "$MATOMO_VOLUME_DIR" "--exclude" "$(realpath --relative-to="$MATOMO_BASE_DIR" "$MATOMO_CONF_FILE")")
if [[ -n "$MATOMO_EXCLUDED_DATA_FROM_UPDATE" ]]; then
for file in $MATOMO_EXCLUDED_DATA_FROM_UPDATE; do
rsync_args+=("--exclude")
rsync_args+=("$(realpath --relative-to="$MATOMO_BASE_DIR" "$file")")
done
fi
rsync "${rsync_args[@]}"
info "Restoring Matomo installation"
restore_persisted_app "$app_name" "$MATOMO_DATA_TO_PERSIST"
info "Trying to connect to the database server"

View File

@ -25,6 +25,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
# variable will be overridden with the value specified in that file
matomo_env_vars=(
MATOMO_DATA_TO_PERSIST
MATOMO_EXCLUDED_DATA_FROM_UPDATE
MATOMO_SKIP_BOOTSTRAP
MATOMO_PROXY_HOST_HEADER
MATOMO_PROXY_CLIENT_HEADER
@ -86,6 +87,8 @@ export MATOMO_CONF_FILE="${MATOMO_CONF_DIR}/config.ini.php"
# Matomo persistence configuration
export MATOMO_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/matomo"
export MATOMO_DATA_TO_PERSIST="${MATOMO_DATA_TO_PERSIST:-$MATOMO_BASE_DIR}"
export MATOMO_EXCLUDED_DATA_FROM_UPDATE="${MATOMO_EXCLUDED_DATA_FROM_UPDATE:-}"
# Matomo configuration
export MATOMO_SKIP_BOOTSTRAP="${MATOMO_SKIP_BOOTSTRAP:-}" # only used during the first initialization

View File

@ -278,6 +278,7 @@ Bitnami provides up-to-date versions of MariaDB and Matomo, including security p
| Name | Description | Default Value |
|----------------------------------------|------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
| `MATOMO_DATA_TO_PERSIST` | Files to persist relative to the Matomo installation directory. To provide multiple values, separate them with a whitespace. | `$MATOMO_BASE_DIR` |
| `MATOMO_EXCLUDED_DATA_FROM_UPDATE` | Files to exclude from being updated relative to the Matomo installation directory (same as config.ini.php). To provide multiple values, separate them with a whitespace. No defaults. | `nil` |
| `MATOMO_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `nil` |
| `MATOMO_PROXY_HOST_HEADER` | Specify the host IP HTTP Header. Usually HTTP_X_FORWARDED_HOST. No defaults. | `nil` |
| `MATOMO_PROXY_CLIENT_HEADER` | Specify the client IP HTTP Header. Usually HTTP_X_FORWARDED_FOR. | `nil` |