Borg backup update for gitea dump, mysql/postgresql info block
Gitea dump has now settings for - temp folder (GITEA_TEMP_DIR) - new name for working dir (GITEA_WORKING_DIR) from old (GITEA_TMP) MySQL and PostgreSQL exports have a run time output per db dump set and not only at the end of the full run
This commit is contained in:
@@ -29,9 +29,13 @@ if [ -z "${GIT_USER}" ]; then
|
||||
GIT_USER="git";
|
||||
fi;
|
||||
# set GITEA_* if not set
|
||||
if [ -z "${GITEA_TMP}" ]; then
|
||||
if [ -z "${GITEA_WORKING_DIR}" ]; then
|
||||
# run gitea backup (user mktemp?)
|
||||
GITEA_TMP="/tmp/gitea/";
|
||||
GITEA_WORKING_DIR="/var/tmp/gitea/";
|
||||
fi;
|
||||
# general temp folder for temporary data storage, this is not working output folder
|
||||
if [ -z "${GITEA_TEMP_DIR}"]; then
|
||||
GITEA_TEMP_DIR="/var/tmp";
|
||||
fi;
|
||||
if [ -z "${GITEA_BIN}" ]; then
|
||||
GITEA_BIN="/usr/local/bin/gitea";
|
||||
@@ -39,6 +43,10 @@ fi;
|
||||
if [ -z "${GITEA_CONFIG}" ]; then
|
||||
GITEA_CONFIG="/etc/gitea/app.ini"
|
||||
fi;
|
||||
# This one is not advertised in the config file as it is not recommended to change
|
||||
if [ -z "${GITEA_EXPORT_TYPE}" ]; then
|
||||
GITEA_EXPORT_TYPE="zip";
|
||||
fi;
|
||||
if [ ! -f "${GITEA_BIN}" ]; then
|
||||
echo "[! $(date +'%F %T')] Cannot find gitea binary";
|
||||
. "${DIR}/borg.backup.functions.close.sh" 1;
|
||||
@@ -49,6 +57,16 @@ if [ ! -f "${GITEA_CONFIG}" ]; then
|
||||
. "${DIR}/borg.backup.functions.close.sh" 1;
|
||||
exit 1;
|
||||
fi;
|
||||
# some basic checks with abort
|
||||
if [ ! -d "${GITEA_TEMP_DIR}" ]; then
|
||||
echo "Temp directory does not exist: ${GITEA_TEMP_DIR}";
|
||||
exit;
|
||||
fi;
|
||||
# we should check GITEA_EXPORT_TYPE too at some point for an allow list
|
||||
# At the moment warn if not zip
|
||||
if [ "${GITEA_EXPORT_TYPE}" != "zip" ]; then
|
||||
echo "[!!!!] The gitea export type has been changed from 'zip' to '${GITEA_EXPORT_TYPE}'. This can either break or make exports take very ling";
|
||||
fi;
|
||||
# Filename
|
||||
FILENAME="gitea.backup.zip";
|
||||
# backup set and prefix
|
||||
@@ -60,7 +78,7 @@ BORG_CALL=$(echo "${_BORG_CALL}" | sed -e "s/##FILENAME##/${FILENAME}/" | sed -e
|
||||
BORG_PRUNE=$(echo "${_BORG_PRUNE}" | sed -e "s/##BACKUP_SET_PREFIX##/${BACKUP_SET_PREFIX}/");
|
||||
printf "${PRINTF_SUB_BLOCK}" "BACKUP: git data and database" "$(date +'%F %T')" "${MODULE}";
|
||||
if [ ${DEBUG} -eq 1 ] || [ ${DRYRUN} -eq 1 ]; then
|
||||
echo "sudo -u ${GIT_USER} ${GITEA_BIN} dump -c ${GITEA_CONFIG} -w ${GITEA_TMP} -L -f - | ${BORG_CALL}";
|
||||
echo "sudo -u ${GIT_USER} ${GITEA_BIN} dump -c ${GITEA_CONFIG} -w ${GITEA_WORKING_DIR} -t ${GITEA_TEMP_DIR} --type ${GITEA_EXPORT_TYPE} -L -f - | ${BORG_CALL}";
|
||||
if [ -z "${ONE_TIME_TAG}" ]; then
|
||||
echo "${BORG_PRUNE}";
|
||||
fi;
|
||||
@@ -70,13 +88,13 @@ if [ ${DRYRUN} -eq 0 ]; then
|
||||
# below was an old workaround
|
||||
#export USER="${LOGNAME}" # workaround for broken gitea EUID check
|
||||
# make sure temp folder is there and is set as git. user
|
||||
if [ ! -d "${GITEA_TMP}" ]; then
|
||||
mkdir -p "${GITEA_TMP}";
|
||||
if [ ! -d "${GITEA_WORKING_DIR}" ]; then
|
||||
mkdir -p "${GITEA_WORKING_DIR}";
|
||||
fi;
|
||||
chown -R ${GIT_USER}. "${GITEA_TMP}";
|
||||
chown -R ${GIT_USER}. "${GITEA_WORKING_DIR}";
|
||||
# this needs to be run in a folder that can be stat by git user
|
||||
cd "${GITEA_TMP}";
|
||||
sudo -u ${GIT_USER} ${GITEA_BIN} dump -c ${GITEA_CONFIG} -w ${GITEA_TMP} -L -f - | ${BORG_CALL};
|
||||
cd "${GITEA_WORKING_DIR}";
|
||||
sudo -u ${GIT_USER} ${GITEA_BIN} dump -c ${GITEA_CONFIG} -w ${GITEA_WORKING_DIR} -t ${GITEA_TEMP_DIR} --type ${GITEA_EXPORT_TYPE} -L -f - | ${BORG_CALL};
|
||||
) 2>&1 | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' # remove all ESC strings
|
||||
fi;
|
||||
if [ -z "${ONE_TIME_TAG}" ]; then
|
||||
|
||||
Reference in New Issue
Block a user