diff --git a/datacore.yml b/datacore.yml index baa9517d24cf4110d9939950d48bfbe6967730df..aad7ab64381017dc30b99250cad945482de52bf5 100644 --- a/datacore.yml +++ b/datacore.yml @@ -24,6 +24,7 @@ DeployDataCore: # Create ./borgconfig/.env ./borgconfig/crontab.txt ./borgconfig/config.yaml - export HEALTHCHECK1=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="Borg Backup datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="55 */6 * * *") - export HEALTHCHECK2=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="Borg Backup Check datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 23 1 * *") + - export HEALTHCHECK3=$(python3 /usr/local/bin/healthchecks.py get_curl_for_ping ${HEALTHCHECK_URL} ${HEALTHCHECK_API_KEY} --host=${HOST} --channel=${HEALTHCHECK_API_CHANNELS} --jobname="Borg Backup Compact datacore_${CI_PROJECT_ID}_${CI_COMMIT_REF_NAME}" --schedule="30 23 5 * *") - export EXTERNALREPO= - if [[ "$CI_COMMIT_REF_NAME" == "develop" ]]; then export EXTERNALREPO=" - ${DATACORE_BORGREPO}"; fi - curl --silent --retry 2 https://gitlab.lakedrops.com/gitlab-ci-cd/general/-/raw/main/templates/datacore/borg-config.yaml | envsubst > borgconfig/config.yaml diff --git a/templates/datacore/borg-crontab.txt b/templates/datacore/borg-crontab.txt index e6b8a4ae136413c41cc4138d50ec9cde4c8fc95a..87a67fcb7b24837f15b84afa6dafb3c9b6d1b2c3 100644 --- a/templates/datacore/borg-crontab.txt +++ b/templates/datacore/borg-crontab.txt @@ -1,2 +1,3 @@ 55 */6 * * * /usr/local/bin/borgmatic --stats -v 0 2>&1 && ${HEALTHCHECK1} 30 23 1 * * /usr/local/bin/borgmatic check -v 0 2>&1 && ${HEALTHCHECK2} +30 23 5 * * /usr/local/bin/borgmatic compact -v 0 2>&1 && ${HEALTHCHECK3}