From 3163150be54fb01aab718c9d03f2d98e5c4850b8 Mon Sep 17 00:00:00 2001 From: f Date: Thu, 28 Sep 2023 10:22:09 -0300 Subject: [PATCH] feat: send log to zulip --- Dockerfile | 2 +- backup.sh | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17cf164..7609118 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV SSH_SERVER "" ENV SSH_USER root ENV SSH_PORT 22 -RUN apk add --no-cache borgbackup openssh-client +RUN apk add --no-cache borgbackup openssh-client zulip-client COPY ./monit.conf /etc/monit.d/borg.conf COPY ./backup.sh /usr/local/bin/backup diff --git a/backup.sh b/backup.sh index eb7e99d..3274d82 100755 --- a/backup.sh +++ b/backup.sh @@ -35,9 +35,13 @@ for signal in TERM QUIT HUP EXIT INT KILL; do done # It'll fail the second time -borg init --encryption=repokey "${SSH_ALIAS}:${DEST}" -borg create -v --stats "${SSH_ALIAS}:${DEST}::${DATE}" "${ORIG}" -borg prune -v --stats --keep-daily ${KEEP} "${SSH_ALIAS}:${DEST}" -borg list "${SSH_ALIAS}:${DEST}" +borg init --encryption=repokey "${SSH_ALIAS}:${DEST}" 2>&1 | tee /tmp/backup.log +borg create -v --stats "${SSH_ALIAS}:${DEST}::${DATE}" "${ORIG}" 2>&1 | tee -a /tmp/backup.log +borg prune -v --stats --keep-daily ${KEEP} "${SSH_ALIAS}:${DEST}" 2>&1 | tee -a /tmp/backup.log +borg list "${SSH_ALIAS}:${DEST}" 2>&1 | tee -a /tmp/backup.log + +if test -n "${ZULIP_KEY}"; then + cat /tmp/backup.log | zulip-client -u "${ZULIP_URL}" -b "${ZULIP_BOT}" -s "${ZULIP_STREAM}" -t "${ZULIP_TOPIC}" +fi exit $?