diff --git a/borg.backup.functions.init.sh b/borg.backup.functions.init.sh index d7bbb5c..61abc5a 100644 --- a/borg.backup.functions.init.sh +++ b/borg.backup.functions.init.sh @@ -163,9 +163,11 @@ ZABBIX_DUMP_BIN=""; ZABBIX_CONFIG=""; ZABBIX_DATABASE=""; ZABBIX_UNKNOWN_TABLES=""; +ZABBIX_DB_PORT=""; OPT_ZABBIX_DUMP=""; OPT_ZABBIX_CONFIG=""; OPT_ZABBIX_UNKNOWN_TABLES=""; +OPT_ZABBIX_DB_PORT=""; # default keep 7 days, 4 weeks, 6 months, 1 year # if set 0, ignore/off # note that for last/hourly it is needed to create a different diff --git a/borg.backup.zabbix.settings-default b/borg.backup.zabbix.settings-default index d79920a..b521f9c 100644 --- a/borg.backup.zabbix.settings-default +++ b/borg.backup.zabbix.settings-default @@ -15,5 +15,5 @@ ZABBIX_DATABASE=""; ZABBIX_CONFIG=""; # unknown tables, default ignore, is set to true, will force backup them 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=""; diff --git a/borg.backup.zabbix.sh b/borg.backup.zabbix.sh index 3db68d6..9cedca2 100755 --- a/borg.backup.zabbix.sh +++ b/borg.backup.zabbix.sh @@ -37,8 +37,9 @@ fi; if [ "${ZABBIX_DATABASE}" = "psql" ]; then OPT_ZABBIX_DUMP="-C"; fi; -if [ -z "${ZABBIX_DB_PORT}" ]; then - ZABBIX_DB_PORT="5432"; +OPT_ZABBIX_DB_PORT=""; +if [ -n "${ZABBIX_DB_PORT}" ]; then + OPT_ZABBIX_DB_PORT="-P ${ZABBIX_DB_PORT}"; fi; if [ "${ZABBIX_DATABASE}" != "psql" ] && [ "${ZABBIX_DATABASE}" != "mysql" ]; then 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}"; 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 echo "${BORG_PRUNE}"; fi; fi; 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; if [ -z "${ONE_TIME_TAG}" ]; then printf "${PRINTF_SUB_BLOCK}" "PRUNE" "$(date +'%F %T')" "${MODULE}";