Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-07-26 18:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update 1.2.2.3 beta

Browse Source
This commit is contained in:
MacRimi
2026-07-06 17:15:22 +02:00
parent 63f82d971d
commit 6f0fc68c3d
4 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/backup_restore/backup_scheduler.sh
View File

@@ -422,11 +422,22 @@ _create_job() {
--inputbox "$(translate "Backup ID for this job:")" \
"$HB_UI_INPUT_H" "$HB_UI_INPUT_W" "$bid" 3>&1 1>&2 2>&3) || return 1
bid=$(echo "$bid" | tr -cs '[:alnum:]_-' '-' | sed 's/-*$//')
# PBS_KEYFILE: `hb_ask_pbs_encryption` sets HB_PBS_KEYFILE_OPT
# to the FULL CLI flag string ("--keyfile /path") when
# encryption is accepted, and leaves it empty otherwise. The
# previous read of `HB_PBS_KEYFILE` was picking up an unset
# variable and always wrote an empty PBS_KEYFILE — so the
# Monitor Web (which detects encryption from a non-empty
# PBS_KEYFILE line) surfaced every CLI-created encrypted job
# as unencrypted. Derive the canonical path from
# HB_PBS_KEYFILE_OPT presence instead.
local pbs_kf_val=""
[[ -n "${HB_PBS_KEYFILE_OPT:-}" ]] && pbs_kf_val="$HB_STATE_DIR/pbs-key.conf"
lines+=(
"PBS_REPOSITORY=${HB_PBS_REPOSITORY}"
"PBS_PASSWORD=${HB_PBS_SECRET}"
"PBS_BACKUP_ID=${bid}"
"PBS_KEYFILE=${HB_PBS_KEYFILE:-}"
"PBS_KEYFILE=${pbs_kf_val}"
"PBS_ENCRYPTION_PASSWORD=${HB_PBS_ENC_PASS:-}"
)
;;