From e860a26c39391c1fc70139f5005136e276e406ff Mon Sep 17 00:00:00 2001 From: RolandS <1+xosna@noreply.localhost> Date: Wed, 23 Sep 2026 19:59:11 +0200 Subject: [PATCH] install.sh aktualisiert --- install.sh | 114 +++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 64 deletions(-) diff --git a/install.sh b/install.sh index 87f1862..4362aac 100644 --- a/install.sh +++ b/install.sh @@ -89,10 +89,8 @@ echo -e "${CYAN}╔══ Schritt 2: Version ═══════════ echo "" info "Lese verfügbare ${DISTRO_LABEL}-Templates (amd64) aus der PVE-Datenbank …" -# Template-Liste aktualisieren (leise, falls nötig) pveam update &>/dev/null || true -# Alle passenden amd64-Templates holen, nach Versionsnummer sortieren mapfile -t ALL_TEMPLATES < <( pveam available --section system 2>/dev/null \ | awk '{print $2}' \ @@ -103,8 +101,7 @@ mapfile -t ALL_TEMPLATES < <( [[ ${#ALL_TEMPLATES[@]} -eq 0 ]] && error "Keine ${DISTRO_LABEL}-Templates (amd64) gefunden. Bitte 'pveam update' ausführen." -# ── Versionsnummern extrahieren und deduplizieren ────────────────────────────── -declare -A VER_TO_TEMPLATE # major_version → neuestes Template +declare -A VER_TO_TEMPLATE declare -a VER_ORDER=() for t in "${ALL_TEMPLATES[@]}"; do @@ -114,9 +111,7 @@ for t in "${ALL_TEMPLATES[@]}"; do ver=$(echo "$t" | grep -oP 'ubuntu-\K[0-9]+\.[0-9]+' | head -1) fi [[ -z "$ver" ]] && continue - # Letztes (neuestes) Template pro Version merken VER_TO_TEMPLATE["$ver"]="$t" - # Version in geordneter Liste nur einmal speichern if [[ ! " ${VER_ORDER[*]} " =~ " ${ver} " ]]; then VER_ORDER+=("$ver") fi @@ -124,9 +119,8 @@ done [[ ${#VER_ORDER[@]} -eq 0 ]] && error "Konnte keine Versionsnummern aus den Templates extrahieren." -# ── Immer genau 3 Versionen anzeigen: vorherige / aktuelle / nächste ─────────── TOTAL=${#VER_ORDER[@]} -CURRENT_IDX=$(( TOTAL - 1 )) # höchste bekannte = aktuell stabil +CURRENT_IDX=$(( TOTAL - 1 )) PREV_IDX=$(( CURRENT_IDX - 1 )) CURRENT_VER="${VER_ORDER[$CURRENT_IDX]}" @@ -137,7 +131,6 @@ else NEXT_VER="$(( uyr + 2 )).${umn}" fi -# Prüfen ob PVE die nächste Version bereits kennt NEXT_VER_IN_PVE=false NEXT_TEMPLATE_PVE="" if [[ -n "${VER_TO_TEMPLATE[$NEXT_VER]+x}" ]]; then @@ -145,7 +138,6 @@ if [[ -n "${VER_TO_TEMPLATE[$NEXT_VER]+x}" ]]; then NEXT_TEMPLATE_PVE="${VER_TO_TEMPLATE[$NEXT_VER]}" fi -# Vorherige Version: entweder aus PVE oder synthetisch if (( PREV_IDX >= 0 )); then PREV_VER="${VER_ORDER[$PREV_IDX]}" PREV_IN_PVE=true @@ -161,12 +153,10 @@ else PREV_TEMPLATE="" fi -# ── Anzeige-Arrays aufbauen ──────────────────────────────────────────────────── declare -a SHOW_VERS=() declare -a SHOW_LABELS=() declare -a SHOW_AVAIL=() -# Slot 1: Vorherige Version SHOW_VERS+=("$PREV_VER") if $PREV_IN_PVE; then SHOW_LABELS+=("Vorherige Version (${DISTRO_LABEL} ${PREV_VER})") @@ -176,13 +166,11 @@ else SHOW_AVAIL+=("false") fi -# Slot 2: Aktuelle Version (Standard) SHOW_VERS+=("$CURRENT_VER") SHOW_LABELS+=("Aktuelle Version (${DISTRO_LABEL} ${CURRENT_VER}) ← empfohlen") SHOW_AVAIL+=("true") DEFAULT_VER_IDX=2 -# Slot 3: Nächste Version SHOW_VERS+=("$NEXT_VER") if $NEXT_VER_IN_PVE; then SHOW_LABELS+=("Nächste Version (${DISTRO_LABEL} ${NEXT_VER}) [experimentell]") @@ -192,7 +180,6 @@ else SHOW_AVAIL+=("false") fi -# ── Versionsauswahl ausgeben ─────────────────────────────────────────────────── echo -e " ${DISTRO_LABEL}-Versionen (aus PVE-Datenbank + Berechnung):\n" for i in "${!SHOW_VERS[@]}"; do num=$(( i + 1 )) @@ -233,20 +220,15 @@ while true; do done echo "" -# ── Distro-spezifische Defaults ──────────────────────────────────────────────── if [[ "$DISTRO" == "debian" ]]; then DEFAULT_RAM=512; DEFAULT_DISK=4; DEFAULT_HOSTNAME="debian" DISTRO_BADGE="https://img.shields.io/badge/Debian%20${CHOSEN_VER}-A81D33?style=for-the-badge&logo=debian&logoColor=white" DISTRO_LINK="https://www.debian.org" - DOCS_LABEL="Debian Docs"; DOCS_URL="https://www.debian.org/releases/" - PKG_LABEL="Debian Packages"; PKG_URL="https://packages.debian.org" SSH_CFG_MODE="sshd_config" else DEFAULT_RAM=1024; DEFAULT_DISK=8; DEFAULT_HOSTNAME="ubuntu-server" DISTRO_BADGE="https://img.shields.io/badge/Ubuntu%20${CHOSEN_VER// /%20}%20LTS-E95420?style=for-the-badge&logo=ubuntu&logoColor=white" DISTRO_LINK="https://ubuntu.com/server" - DOCS_LABEL="Ubuntu Server Docs"; DOCS_URL="https://ubuntu.com/server/docs" - PKG_LABEL="Ubuntu Packages"; PKG_URL="https://packages.ubuntu.com" SSH_CFG_MODE="sshd_config_d" fi @@ -264,52 +246,77 @@ ask "Hostname" "$DEFAULT_HOSTNAME" HOSTNAME ask_password "Root-Passwort" PASSWORD echo "" -# ── Storage-Auswahl ──────────────────────────────────────────────────────────── +# ── Storage-Auswahl (FEHLERBEHOBEN) ─────────────────────────────────────────── echo -e "${CYAN}── Storage-Auswahl ──────────────────────────────────────────${NC}" echo -e " Verfügbare Storages:\n" + mapfile -t STORAGE_LINES < <( pvesm status --content rootdir 2>/dev/null \ | awk 'NR>1 && $3=="active" {print $1, $2, $5, $4}' | sort ) -[[ ${#STORAGE_LINES[@]} -eq 0 ]] && mapfile -t STORAGE_LINES < <( - pvesm status 2>/dev/null | awk 'NR>1 && $3=="active" {print $1, $2, $5, $4}' | sort -) + if [[ ${#STORAGE_LINES[@]} -eq 0 ]]; then - warn "Keine Storages gefunden – manuelle Eingabe." + mapfile -t STORAGE_LINES < <( + pvesm status 2>/dev/null | awk 'NR>1 && $3=="active" {print $1, $2, $5, $4}' | sort + ) +fi + +if [[ ${#STORAGE_LINES[@]} -eq 0 ]]; then + warn "Keine Storages automatisch ermittelt – manuelle Eingabe." ask "Storage-Name" "local-lvm" STORAGE else local_human_size() { local kb=$1 - (( kb >= 1073741824 )) && { printf "%.1f TiB" "$(echo "scale=1;$kb/1073741824"|bc)"; return; } - (( kb >= 1048576 )) && { printf "%.1f GiB" "$(echo "scale=1;$kb/1048576"|bc)"; return; } - (( kb >= 1024 )) && { printf "%.1f MiB" "$(echo "scale=1;$kb/1024"|bc)"; return; } - printf "%d KiB" "$kb" + if ! [[ "$kb" =~ ^[0-9]+$ ]]; then echo "n/a"; return; fi + if (( kb >= 1073741824 )); then + printf "%.1f TiB" "$(echo "scale=1;$kb/1073741824" | bc 2>/dev/null || echo 0)" + elif (( kb >= 1048576 )); then + printf "%.1f GiB" "$(echo "scale=1;$kb/1048576" | bc 2>/dev/null || echo 0)" + elif (( kb >= 1024 )); then + printf "%.1f MiB" "$(echo "scale=1;$kb/1024" | bc 2>/dev/null || echo 0)" + else + printf "%d KiB" "$kb" + fi } + declare -a ST_NAMES=() printf " ${BOLD}\%-4s \%-20s \%-14s \%-12s \%-12s${NC}\n" "Nr." "Name" "Typ" "Frei" "Gesamt" echo -e " ──────────────────────────────────────────────────────────" i=1 for line in "${STORAGE_LINES[@]}"; do read -r sname stype sused stotal <<< "$line" + + # Sichere Prüfung auf Integer-Werte sfree=0 - [[ "$stotal" =~ ^[0-9]+$ && "$sused" =~ ^[0-9]+$]] && sfree=$(( stotal - sused )) - if [[ "$stotal" =~ ^[0-9]+$ ]] && (( stotal > 0 )); then - fs=$(local_human_size "$sfree"); ts=$(local_human_size "$stotal") + if [[ "${stotal:-}" =~ ^[0-9]+$ ]] && [[ "${sused:-}" =~ ^[0-9]+$ ]]; then + sfree=$(( stotal - sused )) + fi + + if [[ "${stotal:-}" =~ ^[0-9]+$ ]] && [ "$stotal" -gt 0 ]; then + fs=$(local_human_size "$sfree") + ts=$(local_human_size "$stotal") pct=$(( sfree * 100 / stotal )) - col="$GREEN"; (( pct < 15 )) && col="$RED"; (( pct>=15 && pct<30 )) && col="$YELLOW" + col="$GREEN" + if [ "$pct" -lt 15 ]; then col="$RED"; elif [ "$pct" -lt 30 ]; then col="$YELLOW"; fi else fs="n/a"; ts="n/a"; col="$NC" fi + printf " ${BOLD}%-4s${NC}${col}%-20s${NC} \%-14s \%-12s \%-12s\n" "[$i]" "$sname" "$stype" "$fs" "$ts" - ST_NAMES+=("$sname"); (( i++ )) + ST_NAMES+=("$sname") + (( i++ )) done echo "" while true; do echo -ne "${BOLD} Auswahl${NC} [${YELLOW}1${NC}]: " read -r sel; sel="${sel:-1}" - if [[ "$sel" =~ ^[0-9]+$]] && (( sel>=1 && sel<=${#ST_NAMES[@]} )); then - STORAGE="${ST_NAMES[$((sel-1))]}"; success "Storage: ${BOLD}${STORAGE}${NC}"; break - else warn "Ungültige Eingabe."; fi + if [[ "$sel" =~ ^[0-9]+$ ]] && [ "$sel" -ge 1 ] && [ "$sel" -le "${#ST_NAMES[@]}" ]; then + STORAGE="${ST_NAMES[$((sel-1))]}" + success "Storage: ${BOLD}${STORAGE}${NC}" + break + else + warn "Ungültige Eingabe." + fi done fi echo "" @@ -343,11 +350,9 @@ echo "" echo -e "${CYAN}╔══ Schritt 4: Software ════════════════════════════════════════╗${NC}" echo "" -# ── Docker ──────────────────────────────────────────────────────────────────── echo -e "${CYAN}── Docker ───────────────────────────────────────────────────${NC}" if ask_yn "🐳 Docker Engine installieren?" "j"; then INSTALL_DOCKER=true - echo "" echo -e "${CYAN}── Portainer ────────────────────────────────────────────────${NC}" if ask_yn "🖥 Portainer CE (Docker Web-UI) installieren?" "j"; then @@ -364,7 +369,6 @@ else fi echo "" -# ── Ubuntu-spezifische Optionen ──────────────────────────────────────────────── ENABLE_UNATTENDED=false DISABLE_SNAP=false DISABLE_PRO_MOTD=false @@ -380,7 +384,6 @@ if [[ "$DISTRO" == "ubuntu" ]]; then echo "" fi -# ── Optionale Pakete ─────────────────────────────────────────────────────────── echo -e "${CYAN}── Optionale Pakete ─────────────────────────────────────────${NC}" ask_yn "curl, wget, git (Basis-Tools)" "j" && INSTALL_BASETOOLS=true || INSTALL_BASETOOLS=false ask_yn "htop, ncdu, net-tools (System-Monitoring)" "j" && INSTALL_MONITORING=true || INSTALL_MONITORING=false @@ -463,7 +466,6 @@ ask_yn "Jetzt installieren?" "j" || { echo "Abgebrochen."; exit 0; } # INSTALLATION # ══════════════════════════════════════════════════════════════════════════════ -# ── Template herunterladen ───────────────────────────────────────────────────── info "Prüfe Template …" DOWNLOADED=$(pveam list local 2>/dev/null | awk '{print $1}' \vert{} grep -F "$CHOSEN_TEMPLATE" || true) if [[ -z "$DOWNLOADED" ]]; then @@ -475,7 +477,6 @@ else fi TEMPLATE_PATH="local:vztmpl/${CHOSEN_TEMPLATE}" -# ── LXC erstellen ───────────────────────────────────────────────────────────── info "Erstelle LXC-Container ${CTID} …" NET_CONFIG="name=eth0,bridge=${BRIDGE}" [[ "$IP_ADDR" == "dhcp" ]] && NET_CONFIG+=",ip=dhcp" || { @@ -506,11 +507,9 @@ sleep 6 lxc_exec() { pct exec "$CTID" -- bash -c "$*"; } -# ── Noninteraktiv setzen (Ubuntu) ────────────────────────────────────────────── [[ "$DISTRO" == "ubuntu" ]] && \ lxc_exec "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections 2>/dev/null || true" -# ── System aktualisieren ─────────────────────────────────────────────────────── info "System aktualisieren …" lxc_exec " export DEBIAN_FRONTEND=noninteractive @@ -520,7 +519,6 @@ apt-get install -y -qq ca-certificates locales " success "System aktuell." -# ── Zeitzone & Locale ────────────────────────────────────────────────────────── info "Zeitzone & Locale konfigurieren …" lxc_exec " export DEBIAN_FRONTEND=noninteractive @@ -534,7 +532,6 @@ update-locale LANG=de_DE.UTF-8 LC_MESSAGES=en_US.UTF-8 2>/dev/null || true " success "Zeitzone: ${TIMEZONE} | Locale: de_DE.UTF-8" -# ── Ubuntu-spezifisch: Snap / Pro-MOTD / Unattended ─────────────────────────── if [[ "$DISTRO" == "ubuntu" ]]; then if $DISABLE_SNAP; then info "Snap deaktivieren …" @@ -581,7 +578,6 @@ systemctl enable unattended-upgrades --now 2>/dev/null || true fi fi -# ── Optionale Pakete ─────────────────────────────────────────────────────────── PKGS=() $INSTALL_BASETOOLS && PKGS+=(curl wget git)$INSTALL_MONITORING && PKGS+=(htop ncdu tree net-tools iputils-ping) $INSTALL_EDITORS && PKGS+=(vim nano)$INSTALL_CRON && PKGS+=(cron logrotate) @@ -593,7 +589,6 @@ if [[ ${#PKGS[@]} -gt 0 ]]; then success "Pakete installiert." fi -# ── fail2ban konfigurieren ───────────────────────────────────────────────────── if $INSTALL_FAIL2BAN; then info "fail2ban konfigurieren …" lxc_exec " @@ -609,10 +604,9 @@ enabled = true F2B systemctl enable fail2ban --now 2>/dev/null || true " - success "fail2ban aktiv (5 Versuche / 10 Min → 1h Ban)." + success "fail2ban aktiv." fi -# ── UFW konfigurieren ────────────────────────────────────────────────────────── if $INSTALL_UFW; then info "UFW vorkonfigurieren …" lxc_exec " @@ -620,12 +614,11 @@ ufw default deny incoming ufw default allow outgoing ufw allow ${SSH_PORT}/tcp comment 'SSH' " - success "UFW konfiguriert (deaktiviert – mit 'ufw enable' aktivieren)." + success "UFW konfiguriert." fi -# ── Docker installieren ──────────────────────────────────────────────────────── if $INSTALL_DOCKER; then - info "Docker Engine installieren (offizieller Kanal) …" + info "Docker Engine installieren …" lxc_exec " export DEBIAN_FRONTEND=noninteractive apt-get install -y -qq ca-certificates curl gnupg lsb-release @@ -655,7 +648,6 @@ systemctl enable docker --now || warn "Docker-Test fehlgeschlagen – bitte manuell prüfen." fi -# ── Portainer installieren ───────────────────────────────────────────────────── if $INSTALL_PORTAINER; then info "Portainer CE installieren (Port ${PORTAINER_PORT}) …" lxc_exec " @@ -672,13 +664,11 @@ docker run -d \ success "Portainer CE gestartet." fi -# ── SSH konfigurieren ────────────────────────────────────────────────────────── if $ENABLE_ROOT_SSH; then info "SSH-Server konfigurieren …" lxc_exec "export DEBIAN_FRONTEND=noninteractive && apt-get install -y -qq openssh-server" if [[ "$SSH_CFG_MODE" == "sshd_config_d" ]]; then - # Ubuntu: Drop-in Datei lxc_exec " mkdir -p /etc/ssh/sshd_config.d cat > /etc/ssh/sshd_config.d/99-lxc.conf << SSHEOF @@ -687,7 +677,6 @@ Port ${SSH_PORT} SSHEOF " else - # Debian: direkt in sshd_config lxc_exec " sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config grep -q '^PermitRootLogin' /etc/ssh/sshd_config || echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config @@ -696,7 +685,6 @@ grep -q '^Port ' /etc/ssh/sshd_config || echo 'Port ${SSH_PORT}' >> /etc/ssh/ssh " fi - # Auth-Methode case "$SSH_AUTH" in password) lxc_exec " @@ -726,15 +714,13 @@ chmod 600 /root/.ssh/authorized_keys fi fi -# ── Portainer-Timer zurücksetzen ─────────────────────────────────────────────── if $INSTALL_PORTAINER; then - info "Portainer-Timer zurücksetzen (Neustart nach Installation) …" + info "Portainer-Timer zurücksetzen …" pct exec "$CTID" -- docker restart portainer &>/dev/null \ - && success "Portainer neu gestartet – 5-Minuten-Fenster beginnt jetzt." \ - || warn "Portainer-Neustart fehlgeschlagen – manuell: docker restart portainer" + && success "Portainer neu gestartet." \ + || warn "Portainer-Neustart fehlgeschlagen." fi -# ── Proxmox-Notes setzen ─────────────────────────────────────────────────────── info "Setze Proxmox-Hinweise …" sleep 2 NOTES_IP=$(pct exec "$CTID" -- hostname -I 2>/dev/null | awk '{print $1}' || echo "")