From e0130910af25fea254de7c5169eabb05d7cb27f5 Mon Sep 17 00:00:00 2001 From: Jens Reinemann Date: Sun, 17 May 2026 18:22:17 +0200 Subject: [PATCH] chore: migrate server URLs from IP to bollwerk.online domain Replace all HTTP references to 195.246.231.210 with bollwerk.online across skills, prompts, scripts, and app default settings: - Dockerfile: rename KRISENVORRAT_JWT_SECRET to BOLLWERK_JWT_SECRET - SettingsKey.kt: default server URL now http://bollwerk.online:8080 - publish SKILL/prompt/script: HTTP URLs updated to bollwerk.online - vps-deploy SKILL: Admin-UI and health-check URLs updated - run-integration-tests.ps1: default BaseUrl updated SSH commands (ssh/scp) intentionally kept on IP, as DNS is not used for SSH access. --- .github/prompts/publish.prompt.md | 4 ++-- .github/skills/publish/SKILL.md | 8 ++++---- .github/skills/publish/publish-apk.ps1 | 8 ++++---- .github/skills/vps-deploy/SKILL.md | 4 ++-- Dockerfile | 2 +- .../main/java/de/bollwerk/app/domain/model/SettingsKey.kt | 2 +- run-integration-tests.ps1 | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/prompts/publish.prompt.md b/.github/prompts/publish.prompt.md index 42847b9..e21a228 100644 --- a/.github/prompts/publish.prompt.md +++ b/.github/prompts/publish.prompt.md @@ -56,5 +56,5 @@ Berichte kurz: - Build/Test-Status (✅ / ❌) - Push-Status (✅ / ❌) - VPS-Deployment (✅ / ❌) -- Homepage-URL: `http://195.246.231.210:8080/` -- Version-API: `http://195.246.231.210:8080/api/version` +- Homepage-URL: `http://bollwerk.online:8080/` +- Version-API: `http://bollwerk.online:8080/api/version` diff --git a/.github/skills/publish/SKILL.md b/.github/skills/publish/SKILL.md index 9386e85..9c7d8f1 100644 --- a/.github/skills/publish/SKILL.md +++ b/.github/skills/publish/SKILL.md @@ -15,7 +15,7 @@ Dieser Skill deckt den vollständigen Workflow ab, um eine neue App-Version auf ## Architektur-Überblick ``` -App (lokal) VPS (195.246.231.210) +App (lokal) VPS (bollwerk.online) ───────────── ───────────────────── app/build.gradle.kts /opt/bollwerk/ versionCode / versionName ├── docker-compose.yml (BOLLWERK_APP_VERSION_CODE/NAME) @@ -88,15 +88,15 @@ ssh root@195.246.231.210 "cd /opt/bollwerk && docker compose up -d" ```powershell # Version-API prüfen -Invoke-WebRequest -Uri "http://195.246.231.210:8080/api/version" -UseBasicParsing | Select-Object -ExpandProperty Content +Invoke-WebRequest -Uri "http://bollwerk.online:8080/api/version" -UseBasicParsing | Select-Object -ExpandProperty Content # Homepage prüfen (QR-Code-Seite) -Invoke-WebRequest -Uri "http://195.246.231.210:8080/" -UseBasicParsing | Select-Object StatusCode, StatusDescription +Invoke-WebRequest -Uri "http://bollwerk.online:8080/" -UseBasicParsing | Select-Object StatusCode, StatusDescription ``` Erwartete Ausgabe von `/api/version`: ```json -{"versionCode":,"versionName":"","apkUrl":"http://195.246.231.210:8080/static/app-latest.apk"} +{"versionCode":,"versionName":"","apkUrl":"http://bollwerk.online:8080/static/app-latest.apk"} ``` --- diff --git a/.github/skills/publish/publish-apk.ps1 b/.github/skills/publish/publish-apk.ps1 index 05dd55f..bd7f69b 100644 --- a/.github/skills/publish/publish-apk.ps1 +++ b/.github/skills/publish/publish-apk.ps1 @@ -83,7 +83,7 @@ if ($SkipVerify) { Start-Sleep -Seconds 5 try { - $response = Invoke-WebRequest -Uri "http://195.246.231.210:8080/api/version" -UseBasicParsing -TimeoutSec 10 + $response = Invoke-WebRequest -Uri "http://bollwerk.online:8080/api/version" -UseBasicParsing -TimeoutSec 10 $versionJson = $response.Content | ConvertFrom-Json if ($versionJson.versionCode -eq $VersionCode -and $versionJson.versionName -eq $VersionName) { @@ -94,10 +94,10 @@ if ($SkipVerify) { } } catch { Write-Warning "Verifizierung fehlgeschlagen: $_" - Write-Host "Manuell pruefen: http://195.246.231.210:8080/api/version" -ForegroundColor DarkGray + Write-Host "Manuell pruefen: http://bollwerk.online:8080/api/version" -ForegroundColor DarkGray } } Write-Host "`n=== Publish abgeschlossen ===" -ForegroundColor Cyan -Write-Host "Homepage: http://195.246.231.210:8080/" -ForegroundColor DarkGray -Write-Host "API: http://195.246.231.210:8080/api/version" -ForegroundColor DarkGray +Write-Host "Homepage: http://bollwerk.online:8080/" -ForegroundColor DarkGray +Write-Host "API: http://bollwerk.online:8080/api/version" -ForegroundColor DarkGray diff --git a/.github/skills/vps-deploy/SKILL.md b/.github/skills/vps-deploy/SKILL.md index 7a8302d..ffb15ec 100644 --- a/.github/skills/vps-deploy/SKILL.md +++ b/.github/skills/vps-deploy/SKILL.md @@ -127,7 +127,7 @@ Der Server nutzt JWT-basierte Authentifizierung (kein API-Key mehr). ### Admin-Zugang -- **Admin-UI:** `http://195.246.231.210:8080/admin/` +- **Admin-UI:** `http://bollwerk.online:8080/admin/` - **Admin-User:** `admin` - **Admin-Passwort:** Der User muss das Passwort selbst eingeben. Es ist NICHT gespeichert – bei Bedarf den User fragen. - Beim ersten Start ohne `BOLLWERK_ADMIN_PASSWORD` ENV wird ein zufälliges Passwort generiert und in die Logs geschrieben. @@ -183,7 +183,7 @@ ssh root@195.246.231.210 "docker logs bollwerk-server -f" ```powershell # Vom lokalen PC -Invoke-WebRequest -Uri "http://195.246.231.210:8080/api/health" -UseBasicParsing +Invoke-WebRequest -Uri "http://bollwerk.online:8080/api/health" -UseBasicParsing # Auf dem VPS direkt ssh root@195.246.231.210 "curl -s http://localhost:8080/api/health" diff --git a/Dockerfile b/Dockerfile index 2a0f377..424ffb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY --from=builder /app/server/build/libs/server.jar server.jar # Create data directory for APK hosting RUN mkdir -p /app/data -ENV KRISENVORRAT_JWT_SECRET="change-me-to-a-secure-jwt-secret-at-least-32-chars" +ENV BOLLWERK_JWT_SECRET="change-me-to-a-secure-jwt-secret-at-least-32-chars" EXPOSE 8080 diff --git a/app/src/main/java/de/bollwerk/app/domain/model/SettingsKey.kt b/app/src/main/java/de/bollwerk/app/domain/model/SettingsKey.kt index 2d15e75..4d96815 100644 --- a/app/src/main/java/de/bollwerk/app/domain/model/SettingsKey.kt +++ b/app/src/main/java/de/bollwerk/app/domain/model/SettingsKey.kt @@ -23,7 +23,7 @@ internal sealed class SettingsKey(val key: String, val defaultValue: T) { } companion object { - const val DEFAULT_SERVER_URL = "http://195.246.231.210:8080" + const val DEFAULT_SERVER_URL = "http://bollwerk.online:8080" val SENSITIVE_KEYS: Set = setOf( StringKey.AuthAccessToken, diff --git a/run-integration-tests.ps1 b/run-integration-tests.ps1 index 4bc3996..2ab63c3 100644 --- a/run-integration-tests.ps1 +++ b/run-integration-tests.ps1 @@ -5,7 +5,7 @@ Testet Auth, Inventory Sync, Messaging (offline delivery), JWT Refresh und parallele WebSocket-Sessions gegen einen laufenden Server. .PARAMETER BaseUrl - Server-URL. Standard: http://195.246.231.210:8080 + Server-URL. Standard: http://bollwerk.online:8080 .PARAMETER AlicePassword Passwort fuer Alice. Standard: alice .PARAMETER BobPassword @@ -15,7 +15,7 @@ .\run-integration-tests.ps1 -BaseUrl "http://localhost:8080" #> param( - [string]$BaseUrl = "http://195.246.231.210:8080", + [string]$BaseUrl = "http://bollwerk.online:8080", [string]$AliceUser = "alice", [string]$AlicePassword = "alice", [string]$BobUser = "bob", @@ -167,7 +167,7 @@ $testInventory = @{ quantity = 12.0 unit = "Stueck" unitPrice = 1.5 - kcalPerUnit = $null + kcalPerUnit = $null expiryDate = "2027-12-31" locationId = 1 notes = "Integrationstest"