ScriptsCollections/BorgBackupWrapper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into shellcheck-cleanup

Browse Source
This commit is contained in:
Clemens Schwaighofer
2025-08-20 22:41:54 +09:00
parent de9d5d3588 07896af1ae
commit acd5d369eb
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
borg.backup.functions.init.sh
View File

@@ -163,9 +163,11 @@ ZABBIX_DUMP_BIN="";
ZABBIX_CONFIG=""; ZABBIX_CONFIG="";
ZABBIX_DATABASE=""; ZABBIX_DATABASE="";
ZABBIX_UNKNOWN_TABLES=""; ZABBIX_UNKNOWN_TABLES="";
ZABBIX_DB_PORT="";
OPT_ZABBIX_DUMP=""; OPT_ZABBIX_DUMP="";
OPT_ZABBIX_CONFIG=""; OPT_ZABBIX_CONFIG="";
OPT_ZABBIX_UNKNOWN_TABLES=""; OPT_ZABBIX_UNKNOWN_TABLES="";
OPT_ZABBIX_DB_PORT="";
# default keep 7 days, 4 weeks, 6 months, 1 year # default keep 7 days, 4 weeks, 6 months, 1 year
# if set 0, ignore/off # if set 0, ignore/off
# note that for last/hourly it is needed to create a different # note that for last/hourly it is needed to create a different

2
borg.backup.zabbix.settings-default
View File

@@ -15,5 +15,5 @@ ZABBIX_DATABASE="";
ZABBIX_CONFIG=""; ZABBIX_CONFIG="";
# unknown tables, default ignore, is set to true, will force backup them # unknown tables, default ignore, is set to true, will force backup them
ZABBIX_UNKNOWN_TABLES=""; ZABBIX_UNKNOWN_TABLES="";
# db port for zabbix, defaults to 5432 # overide zabbix db port read from zabbix config, if not set read from zabbix config
ZABBIX_DB_PORT=""; ZABBIX_DB_PORT="";

9
borg.backup.zabbix.sh
View File

@@ -37,8 +37,9 @@ fi;
if [ "${ZABBIX_DATABASE}" = "psql" ]; then if [ "${ZABBIX_DATABASE}" = "psql" ]; then
OPT_ZABBIX_DUMP="-C"; OPT_ZABBIX_DUMP="-C";
fi; fi;
if [ -z "${ZABBIX_DB_PORT}" ]; then OPT_ZABBIX_DB_PORT="";
ZABBIX_DB_PORT="5432"; if [ -n "${ZABBIX_DB_PORT}" ]; then
OPT_ZABBIX_DB_PORT="-P ${ZABBIX_DB_PORT}";
fi; fi;
if [ "${ZABBIX_DATABASE}" != "psql" ] && [ "${ZABBIX_DATABASE}" != "mysql" ]; then if [ "${ZABBIX_DATABASE}" != "psql" ] && [ "${ZABBIX_DATABASE}" != "mysql" ]; then
echo "[! $(date +'%F %T')] Zabbix dump must have database set to either psql or mysql"; echo "[! $(date +'%F %T')] Zabbix dump must have database set to either psql or mysql";
@@ -73,13 +74,13 @@ fi;
printf "${PRINTF_SUB_BLOCK}" "BACKUP: zabbix settings" "$(date +'%F %T')" "${MODULE}"; printf "${PRINTF_SUB_BLOCK}" "BACKUP: zabbix settings" "$(date +'%F %T')" "${MODULE}";
if [ ${DEBUG} -eq 1 ] || [ ${DRYRUN} -eq 1 ]; then if [ ${DEBUG} -eq 1 ] || [ ${DRYRUN} -eq 1 ]; then
echo "${ZABBIX_DUMP_BIN} -t ${ZABBIX_DATABASE} ${OPT_ZABBIX_UNKNOWN_TABLES} ${OPT_ZABBIX_DUMP} ${OPT_ZABBIX_CONFIG} -o - | ${BORG_CALL}" echo "${ZABBIX_DUMP_BIN} ${OPT_ZABBIX_DB_PORT} -t ${ZABBIX_DATABASE} ${OPT_ZABBIX_UNKNOWN_TABLES} ${OPT_ZABBIX_DUMP} ${OPT_ZABBIX_CONFIG} -o - | ${BORG_CALL}"
if [ -z "${ONE_TIME_TAG}" ]; then if [ -z "${ONE_TIME_TAG}" ]; then
echo "${BORG_PRUNE}"; echo "${BORG_PRUNE}";
fi; fi;
fi; fi;
if [ ${DRYRUN} -eq 0 ]; then if [ ${DRYRUN} -eq 0 ]; then
${ZABBIX_DUMP_BIN} -P ${ZABBIX_DB_PORT} -t ${ZABBIX_DATABASE} ${OPT_ZABBIX_UNKNOWN_TABLES} ${OPT_ZABBIX_DUMP} ${OPT_ZABBIX_CONFIG} -o - | ${BORG_CALL}; ${ZABBIX_DUMP_BIN} ${OPT_ZABBIX_DB_PORT} -t ${ZABBIX_DATABASE} ${OPT_ZABBIX_UNKNOWN_TABLES} ${OPT_ZABBIX_DUMP} ${OPT_ZABBIX_CONFIG} -o - | ${BORG_CALL};
fi; fi;
if [ -z "${ONE_TIME_TAG}" ]; then if [ -z "${ONE_TIME_TAG}" ]; then
printf "${PRINTF_SUB_BLOCK}" "PRUNE" "$(date +'%F %T')" "${MODULE}"; printf "${PRINTF_SUB_BLOCK}" "PRUNE" "$(date +'%F %T')" "${MODULE}";