From d6acccb4c8a4d764be2d361ceccd12455c9b2c72 Mon Sep 17 00:00:00 2001 From: "manuel.maier" Date: Mon, 30 Mar 2026 10:31:56 +0200 Subject: [PATCH] install_newt-msp-site-win_v2.ps1 aktualisiert --- install_newt-msp-site-win_v2.ps1 | 110 ++++++++++++++----------------- 1 file changed, 48 insertions(+), 62 deletions(-) diff --git a/install_newt-msp-site-win_v2.ps1 b/install_newt-msp-site-win_v2.ps1 index df81881..622db75 100644 --- a/install_newt-msp-site-win_v2.ps1 +++ b/install_newt-msp-site-win_v2.ps1 @@ -1,7 +1,7 @@ <# .SYNOPSIS Windows-Installer für den Newt-Client (MAIEREDV). - Features: Winget.pro, NSSM, Hard-Kill (Stopping-Fix), 10MB Log-Rotation, Auto-Cleanup. + Features: Winget.pro, NSSM, Heavy-Duty Kill (Taskkill /F /T), Rename-Move-Trick & Auto-Cleanup. #> param([string]$mode = "install") @@ -25,20 +25,17 @@ function Write-Log($msg, $color = "White") { # 3. Umgebung vorbereiten function Prepare-Environment { if (!(Get-Command winget -ErrorAction SilentlyContinue)) { - Write-Log "Winget fehlt. Installiere via winget.pro..." "Cyan" - try { - Invoke-RestMethod -Uri "https://winget.pro/install.ps1" | Invoke-Expression - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - } catch { Write-Log "FEHLER: Winget-Basis fehlt." "Red"; exit 1 } + Write-Log "Winget fehlt. Installiere..." "Cyan" + try { Invoke-RestMethod -Uri "https://winget.pro/install.ps1" | Invoke-Expression } catch { exit 1 } + $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") } if (!(Get-Command nssm -ErrorAction SilentlyContinue)) { - Write-Log "NSSM wird via Winget geladen..." "Cyan" winget install nssm --silent --accept-package-agreements --accept-source-agreements | Out-Null $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") } } -# 4. Download & Verbesserter Hard-Kill (Stopping-Fix) +# 4. Download & Brutal-Kill mit Rename-Trick function Download-Newt { param($FullVersion) $ArchSuffix = if ([Environment]::Is64BitOperatingSystem) { "windows_amd64.exe" } else { "windows_386.exe" } @@ -49,67 +46,63 @@ function Download-Newt { if (!(Test-Path $InstallDir)) { New-Item -ItemType Directory -Path $InstallDir -Force | Out-Null } if (!(Test-Path $Target)) { - Write-Log "Downloade Version $VersionOnly..." "Cyan" + Write-Log "Download $VersionOnly..." "Cyan" try { Start-BitsTransfer -Source $Url -Destination $Target -Priority Foreground -ErrorAction Stop } catch { Invoke-WebRequest -Uri $Url -OutFile $Target -UseBasicParsing } } - # --- Dienst-Stopp mit verbessertem Hard-Kill --- + # --- AGGRESSIVER STOPP --- $Svc = Get-Service $ServiceName -ErrorAction SilentlyContinue - if ($Svc) { - $WasRunning = $true # Wir gehen davon aus, dass wir ihn nachher wieder starten wollen + if ($Svc -and $Svc.Status -ne 'Stopped') { + Write-Log "Dienst klemmt (Status: $($Svc.Status)). Deaktiviere Autostart..." "Yellow" + Set-Service $ServiceName -StartupType Disabled - if ($Svc.Status -ne 'Stopped') { - Write-Log "Dienst $ServiceName ist im Status '$($Svc.Status)'. Versuche Stop..." "Yellow" - Stop-Service $ServiceName -Force -ErrorAction SilentlyContinue - - $timeout = 30 - $timer = [System.Diagnostics.Stopwatch]::StartNew() - while (((Get-Service $ServiceName).Status -ne 'Stopped') -and ($timer.Elapsed.TotalSeconds -lt $timeout)) { - Start-Sleep -Seconds 2 - } - $timer.Stop() - } + # Versuch 1: Sanft + Stop-Service $ServiceName -Force -ErrorAction SilentlyContinue + Start-Sleep -Seconds 5 - # Wenn er immer noch nicht Stopped ist (z.B. hängt in 'Stopping') -> TASKKILL - if ((Get-Service $ServiceName).Status -ne 'Stopped') { - Write-Log "Dienst reagiert nicht (Status: $((Get-Service $ServiceName).Status)). Erzeuge Hard-Kill!" "Red" - $NewtProcs = Get-Process -Name "newt*" -ErrorAction SilentlyContinue - if ($NewtProcs) { - $NewtProcs | Stop-Process -Force -ErrorAction SilentlyContinue - Write-Log "Prozesse hart beendet." "Yellow" - Start-Sleep -Seconds 2 + # Versuch 2: Taskkill Tree (Härter als Stop-Process) + $Procs = Get-Process -Name "newt*" -ErrorAction SilentlyContinue + if ($Procs) { + foreach ($p in $Procs) { + Write-Log "Sende Hard-Kill (Taskkill /F /T) an PID $($p.Id)..." "Red" + taskkill.exe /F /T /PID $($p.Id) 2>$null } + Start-Sleep -Seconds 3 } - } else { $WasRunning = $false } + } + # --- RENAME-TRICK (Falls Datei noch 'In Use' ist) --- try { + if (Test-Path $Symlink) { + Write-Log "Versuche Datei-Tausch..." "Cyan" + # Wir versuchen die Datei umzubenennen, falls Überschreiben fehlschlägt + $TempName = "$Symlink.dead_" + (Get-Date -Format "yyyyMMdd_HHmmss") + Move-Item -Path $Symlink -Destination $TempName -Force -ErrorAction SilentlyContinue + } Copy-Item -Path $Target -Destination $Symlink -Force - Write-Log "Datei erfolgreich auf $VersionOnly getauscht." "Green" + Write-Log "Datei erfolgreich ersetzt." "Green" } catch { - Write-Log "FEHLER: Datei $Symlink ist trotz Kill gesperrt! Eventuell manueller Zugriff?" "Red" + Write-Log "KRITISCH: Datei blockiert. Update wird nach Reboot aktiv." "Red" } - if ($WasRunning) { - Start-Service $ServiceName - Write-Log "Dienst wurde neu gestartet." "Green" - } + # Dienst wieder scharf schalten + Set-Service $ServiceName -StartupType Automatic + Start-Service $ServiceName -ErrorAction SilentlyContinue + Write-Log "Dienst neu gestartet." "Green" - # Cleanup: Behalte die neuesten 2 Versionen - Get-ChildItem -Path $InstallDir -Filter "newt_*.exe" | + # Cleanup: Alte Versionen UND .dead Leichen entfernen + Get-ChildItem -Path $InstallDir -Filter "newt_*" | Where-Object { $_.Name -ne "newt_latest.exe" } | Sort-Object LastWriteTime -Descending | - Select-Object -Skip 2 | Remove-Item -Force + Select-Object -Skip 3 | Remove-Item -Force -ErrorAction SilentlyContinue } function Setup-Service { if (!(Get-Service $ServiceName -ErrorAction SilentlyContinue)) { Write-Log "--- Erst-Konfiguration ---" "Yellow" - $PangolinID = Read-Host "Pangolin ID" - $PangolinSecret = Read-Host "Secret" - $PangolinEndpoint = Read-Host "Endpoint" + $PangolinID = Read-Host "ID"; $PangolinSecret = Read-Host "Secret"; $PangolinEndpoint = Read-Host "Endpoint" $ArgList = "--id ${PangolinID} --secret ${PangolinSecret} --endpoint ${PangolinEndpoint}" - & nssm install $ServiceName "$Symlink" $ArgList & nssm set $ServiceName AppStdout "$LogFile" & nssm set $ServiceName AppStderr "$LogFile" @@ -117,9 +110,8 @@ function Setup-Service { & nssm set $ServiceName AppRotateOnline 1 & nssm set $ServiceName AppRotateBytes 10485760 Start-Service $ServiceName - Write-Log "Dienst aktiv. Logs: $LogFile" "Green" } else { - # Log-Pfade nachrüsten falls nötig + # Log-Repair für bestehende Dienste & nssm set $ServiceName AppStdout "$LogFile" & nssm set $ServiceName AppStderr "$LogFile" & nssm set $ServiceName AppRotateFiles 1 @@ -133,42 +125,36 @@ function Setup-Task { $Action = New-ScheduledTaskAction -Execute "powershell.exe" -Argument "-NoProfile -ExecutionPolicy Bypass -Command `"$IexCommand`"" $Trigger = New-ScheduledTaskTrigger -Daily -At 3am $Principal = New-ScheduledTaskPrincipal -UserId "SYSTEM" -LogonType ServiceAccount -RunLevel Highest - Register-ScheduledTask -Action $Action -Trigger $Trigger -Principal $Principal -TaskName $UpdaterTaskName -Force | Out-Null - Write-Log "Update-Task (03:00 Uhr) registriert." "Green" + Write-Log "Update-Task (IEX) registriert." "Green" } # --- Main Logic --- Prepare-Environment - if (!(Test-Path $Symlink) -or ($mode -eq "install")) { $v = (Invoke-RestMethod "https://api.github.com/repos/${Repo}/releases/latest").tag_name - Download-Newt $v - Setup-Service - Setup-Task - Write-Log "🚀 Installation abgeschlossen!" "Green" + Download-Newt $v; Setup-Service; Setup-Task + Write-Log "🚀 Installation fertig!" "Green" } elseif ($mode -eq "update" -or (Test-Path $Symlink)) { $v = (Invoke-RestMethod "https://api.github.com/repos/${Repo}/releases/latest").tag_name $vO = $v.TrimStart('v') if (!(Test-Path "${InstallDir}\newt_${vO}.exe")) { - Write-Log "Update auf $vO verfügbar..." "Cyan" + Write-Log "Neue Version $vO gefunden..." "Cyan" Download-Newt $v } else { - Write-Log "System ist aktuell ($vO)." "Cyan" - Setup-Service # Sicherstellen, dass Logs & Rotation stimmen + Write-Log "System aktuell ($vO)." "Cyan" + Setup-Service # Log-Fix falls nötig if ((Get-Service $ServiceName).Status -ne 'Running') { Start-Service $ServiceName } } } elseif ($mode -eq "uninstall") { - Write-Log "Entferne Dienst..." "Yellow" if (Get-Service $ServiceName -ErrorAction SilentlyContinue) { - # Auch hier Hard-Kill Fallback nutzen + Set-Service $ServiceName -StartupType Disabled + taskkill.exe /F /T /IM "newt*" 2>$null Stop-Service $ServiceName -Force -ErrorAction SilentlyContinue - $NewtProcs = Get-Process -Name "newt*" -ErrorAction SilentlyContinue - if ($NewtProcs) { $NewtProcs | Stop-Process -Force } & nssm remove $ServiceName confirm } Unregister-ScheduledTask -TaskName $UpdaterTaskName -Confirm:$false -ErrorAction SilentlyContinue - Write-Log "Deinstallation fertig." "Green" + Write-Log "Alles entfernt." "Green" } \ No newline at end of file