V7
This commit is contained in:
1 parent
e2e6bba06a
commit
3ee6479320
1 file changed
+243
-4
+243
-4
@@ -9,6 +9,107 @@ CONFIG="/etc/pve-guest-update.conf"
|
||||
SERVICE="/etc/systemd/system/pve-guest-update.service"
|
||||
TIMER="/etc/systemd/system/pve-guest-update.timer"
|
||||
|
||||
LOGFILE="/var/log/pve-guest-update.log"
|
||||
NOTIFY_MATCHER="proxmox-updater"
|
||||
NOTIFY_TEMPLATE="proxmox-updater"
|
||||
|
||||
usage() {
|
||||
cat <<'EOF'
|
||||
Proxmox Guest Updater - Installer
|
||||
|
||||
Aufruf:
|
||||
install.sh
|
||||
install.sh --uninstall
|
||||
install.sh --clear-excludes
|
||||
install.sh --help
|
||||
|
||||
Optionen:
|
||||
--uninstall Updater, Timer, Service, Konfiguration und eigene
|
||||
Notification-Hilfsdateien entfernen.
|
||||
--clear-excludes Alle Gast-Ausschlüsse aus der vorhandenen Konfiguration entfernen.
|
||||
--help Diese Hilfe anzeigen.
|
||||
|
||||
Bei interaktiver Installation kann die Ausschlussliste zusätzlich mit
|
||||
"keine", "none" oder "-" vollständig geleert werden.
|
||||
EOF
|
||||
}
|
||||
|
||||
uninstall_updater() {
|
||||
echo
|
||||
echo "Entferne Proxmox Guest Updater ..."
|
||||
|
||||
systemctl disable --now pve-guest-update.timer >/dev/null 2>&1 || true
|
||||
systemctl stop pve-guest-update.service >/dev/null 2>&1 || true
|
||||
|
||||
rm -f "$TIMER" "$SERVICE" "$UPDATER" "$CONFIG"
|
||||
|
||||
rm -f \
|
||||
"/etc/pve/notification-templates/default/${NOTIFY_TEMPLATE}-subject.txt.hbs" \
|
||||
"/etc/pve/notification-templates/default/${NOTIFY_TEMPLATE}-body.txt.hbs" \
|
||||
"/etc/pve/notification-templates/default/${NOTIFY_TEMPLATE}-body.html.hbs"
|
||||
|
||||
if command -v pvesh >/dev/null 2>&1; then
|
||||
pvesh delete "/cluster/notifications/matchers/${NOTIFY_MATCHER}" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl reset-failed pve-guest-update.service >/dev/null 2>&1 || true
|
||||
|
||||
echo "Proxmox Guest Updater wurde entfernt."
|
||||
echo
|
||||
echo "Das bisherige Log wurde absichtlich behalten:"
|
||||
echo " $LOGFILE"
|
||||
echo
|
||||
echo "Zum Löschen des Logs:"
|
||||
echo " rm -f $LOGFILE"
|
||||
}
|
||||
|
||||
clear_excludes() {
|
||||
if [[ ! -f "$CONFIG" ]]; then
|
||||
echo "FEHLER: Keine vorhandene Installation/Konfiguration gefunden."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep -q '^EXCLUDE_GUESTS=' "$CONFIG"; then
|
||||
sed -i 's/^EXCLUDE_GUESTS=.*/EXCLUDE_GUESTS=""/' "$CONFIG"
|
||||
else
|
||||
printf '\nEXCLUDE_GUESTS=""\n' >> "$CONFIG"
|
||||
fi
|
||||
chmod 600 "$CONFIG"
|
||||
echo "Alle Gast-Ausschlüsse wurden entfernt."
|
||||
}
|
||||
|
||||
case "${1:-}" in
|
||||
--uninstall)
|
||||
if [[ $EUID -ne 0 ]]; then
|
||||
echo "FEHLER: Bitte als root ausführen."
|
||||
exit 1
|
||||
fi
|
||||
uninstall_updater
|
||||
exit 0
|
||||
;;
|
||||
--clear-excludes)
|
||||
if [[ $EUID -ne 0 ]]; then
|
||||
echo "FEHLER: Bitte als root ausführen."
|
||||
exit 1
|
||||
fi
|
||||
clear_excludes
|
||||
exit 0
|
||||
;;
|
||||
--help|-h)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
"")
|
||||
;;
|
||||
*)
|
||||
echo "Unbekannte Option: $1"
|
||||
echo
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# ------------------------------------------------------------
|
||||
# Grundprüfungen
|
||||
# ------------------------------------------------------------
|
||||
@@ -167,6 +268,124 @@ ask_yes_no() {
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
check_backup_schedule_conflicts() {
|
||||
local backup_json
|
||||
local result
|
||||
|
||||
if ! command -v pvesh >/dev/null 2>&1 || ! command -v python3 >/dev/null 2>&1; then
|
||||
echo "Backup-Zeitplanprüfung: nicht möglich (pvesh/python3 fehlt)."
|
||||
return
|
||||
fi
|
||||
|
||||
backup_json="$(pvesh get /cluster/backup --output-format json 2>/dev/null || true)"
|
||||
if [[ -z "$backup_json" || "$backup_json" == "[]" ]]; then
|
||||
echo "Backup-Zeitplanprüfung: keine Proxmox-Backup-Jobs gefunden."
|
||||
return
|
||||
fi
|
||||
|
||||
result="$(
|
||||
BACKUP_JSON="$backup_json" python3 - "$DAY_SYSTEMD" "$UPDATE_TIME" <<'PY'
|
||||
import json, os, re, sys
|
||||
|
||||
upd_day = sys.argv[1].lower()
|
||||
upd_time = sys.argv[2]
|
||||
jobs = json.loads(os.environ.get("BACKUP_JSON", "[]"))
|
||||
|
||||
daynum = {"mon":0,"tue":1,"wed":2,"thu":3,"fri":4,"sat":5,"sun":6}
|
||||
ud = daynum[upd_day[:3]]
|
||||
uh, um = map(int, upd_time.split(":"))
|
||||
u = ud*1440 + uh*60 + um
|
||||
|
||||
def days_from_expr(expr):
|
||||
expr = expr.lower().strip()
|
||||
if not expr or expr in ("*", "daily"):
|
||||
return set(range(7))
|
||||
out=set()
|
||||
for part in re.split(r"[,;]", expr):
|
||||
part=part.strip()
|
||||
if ".." in part:
|
||||
a,b=part.split("..",1)
|
||||
a=daynum.get(a[:3]); b=daynum.get(b[:3])
|
||||
if a is None or b is None: continue
|
||||
i=a
|
||||
while True:
|
||||
out.add(i)
|
||||
if i==b: break
|
||||
i=(i+1)%7
|
||||
else:
|
||||
d=daynum.get(part[:3])
|
||||
if d is not None: out.add(d)
|
||||
return out
|
||||
|
||||
conflicts=[]
|
||||
unknown=[]
|
||||
for job in jobs:
|
||||
if str(job.get("enabled","1")).lower() in ("0","false","no"):
|
||||
continue
|
||||
sched=str(job.get("schedule","")).strip()
|
||||
if not sched:
|
||||
continue
|
||||
|
||||
# Common PVE forms: "sun 02:00", "mon..fri 03:00", "02:00"
|
||||
m=re.search(r"(?:(?P<days>[A-Za-z.,]+(?:\.\.[A-Za-z]+)?)\s+)?(?P<h>[0-2]?\d):(?P<m>[0-5]\d)$", sched)
|
||||
if not m:
|
||||
unknown.append((job.get("id","?"), sched))
|
||||
continue
|
||||
|
||||
days=days_from_expr(m.group("days") or "*")
|
||||
bh=int(m.group("h")); bm=int(m.group("m"))
|
||||
for d in days:
|
||||
b=d*1440+bh*60+bm
|
||||
diff=(b-u+7*1440)%(7*1440)
|
||||
if diff>7*1440//2:
|
||||
diff-=7*1440
|
||||
# Potential overlap window: backup starts within 2h before/after updater.
|
||||
if abs(diff) <= 120:
|
||||
conflicts.append((job.get("id","?"), sched, diff))
|
||||
break
|
||||
|
||||
if conflicts:
|
||||
print("WARN")
|
||||
for jid,sched,diff in conflicts:
|
||||
if diff == 0:
|
||||
rel="gleiche Startzeit"
|
||||
elif diff < 0:
|
||||
rel=f"{abs(diff)} Min. vor dem Updater"
|
||||
else:
|
||||
rel=f"{diff} Min. nach dem Updater"
|
||||
print(f" - Backup-Job {jid}: {sched} ({rel})")
|
||||
elif unknown:
|
||||
print("UNKNOWN")
|
||||
for jid,sched in unknown:
|
||||
print(f" - Backup-Job {jid}: {sched}")
|
||||
else:
|
||||
print("OK")
|
||||
PY
|
||||
)"
|
||||
|
||||
case "$result" in
|
||||
WARN*)
|
||||
echo "WARNUNG: Mögliche zeitliche Überschneidung mit Proxmox-Backups:"
|
||||
printf '%s\n' "$result" | tail -n +2
|
||||
echo
|
||||
echo "Geprüft wird ein Sicherheitsfenster von ±2 Stunden um den Updater-Start."
|
||||
echo "Die tatsächliche Backup-Dauer kann Proxmox aus dem Zeitplan nicht vorhersagen."
|
||||
echo "Der Updater wartet zusätzlich auf ein bereits laufendes vzdump-Backup."
|
||||
;;
|
||||
UNKNOWN*)
|
||||
echo "Backup-Zeitplanprüfung: einige Zeitpläne konnten nicht automatisch verglichen werden:"
|
||||
printf '%s\n' "$result" | tail -n +2
|
||||
;;
|
||||
*)
|
||||
echo "Backup-Zeitplanprüfung: keine Proxmox-Backup-Startzeit innerhalb ±2 Stunden."
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "Hinweis: Backups, die innerhalb einer VM/eines LXC selbst laufen,"
|
||||
echo "kann der Proxmox-Host nicht allgemein erkennen."
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------
|
||||
# Einstellungen abfragen
|
||||
# ------------------------------------------------------------
|
||||
@@ -299,9 +518,14 @@ while true; do
|
||||
echo "Bitte Uhrzeit als HH:MM eingeben, z.B. 04:00."
|
||||
done
|
||||
|
||||
echo
|
||||
echo "Prüfe Proxmox-Backup-Zeitpläne ..."
|
||||
check_backup_schedule_conflicts
|
||||
|
||||
echo
|
||||
echo "Gäste können vom automatischen Update ausgeschlossen werden."
|
||||
echo "Mehrere VM-/CT-IDs mit Leerzeichen trennen."
|
||||
echo
|
||||
echo "Ausgeschlossene Gäste (VM-/CT-IDs, durch Leerzeichen getrennt):"
|
||||
echo
|
||||
|
||||
if [[ -n "$EXCLUDE_GUESTS" ]]; then
|
||||
@@ -311,15 +535,21 @@ else
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Enter übernimmt die aktuelle Liste."
|
||||
echo "Ein einzelnes - entfernt alle Ausschlüsse."
|
||||
echo " Enter = bisherige Ausschlüsse beibehalten"
|
||||
echo " keine = alle Ausschlüsse entfernen"
|
||||
echo " none = alle Ausschlüsse entfernen"
|
||||
echo " - = alle Ausschlüsse entfernen"
|
||||
echo " 101 107 = genau diese Gäste ausschließen"
|
||||
echo
|
||||
echo "Nach der Installation können alle Ausschlüsse auch direkt entfernt werden:"
|
||||
echo " curl -fsSL ${RAW}/install.sh | bash -s -- --clear-excludes"
|
||||
echo
|
||||
|
||||
read -r -p "Ausgeschlossene Gäste [${EXCLUDE_GUESTS:-keine}]: " NEW_EXCLUDES </dev/tty
|
||||
|
||||
if [[ -z "$NEW_EXCLUDES" ]]; then
|
||||
:
|
||||
elif [[ "$NEW_EXCLUDES" == "-" ]]; then
|
||||
elif [[ "${NEW_EXCLUDES,,}" == "keine" || "${NEW_EXCLUDES,,}" == "none" || "$NEW_EXCLUDES" == "-" ]]; then
|
||||
EXCLUDE_GUESTS=""
|
||||
else
|
||||
EXCLUDE_GUESTS="$NEW_EXCLUDES"
|
||||
@@ -421,6 +651,8 @@ NOTIFY_TARGET="$NOTIFY_TARGET"
|
||||
EXCLUDE_GUESTS="$EXCLUDE_GUESTS"
|
||||
|
||||
APT_LOCK_TIMEOUT="600"
|
||||
BACKUP_WAIT_TIMEOUT="7200"
|
||||
BACKUP_WAIT_INTERVAL="60"
|
||||
LOG_FILE="/var/log/pve-guest-update.log"
|
||||
EOF
|
||||
|
||||
@@ -495,6 +727,13 @@ echo " ${EXCLUDE_GUESTS:-keine}"
|
||||
echo
|
||||
echo "Es wurde KEIN Update durchgeführt."
|
||||
echo
|
||||
echo "Verwaltung:"
|
||||
echo " Ausschlüsse komplett leeren:"
|
||||
echo " curl -fsSL ${RAW}/install.sh | bash -s -- --clear-excludes"
|
||||
echo
|
||||
echo " Updater vollständig entfernen:"
|
||||
echo " curl -fsSL ${RAW}/install.sh | bash -s -- --uninstall"
|
||||
echo
|
||||
echo "Aktiver Timer:"
|
||||
systemctl list-timers pve-guest-update.timer --no-pager
|
||||
echo
|
||||
Reference in new issue
Block a user