Fix: Align table formatting in Zora documentation and update Keycloak-related configurations
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Successful in 7m42s
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Successful in 7m1s
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 2m58s
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Successful in 1m34s
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Successful in 7m42s
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Successful in 7m1s
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 2m58s
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Successful in 1m34s
This commit is contained in:
@@ -7,13 +7,13 @@ owner: DevOps Engineer
|
||||
|
||||
## 1. System-Umgebung (Infrastruktur)
|
||||
|
||||
| Parameter | Wert | Erklärung |
|
||||
|:-----------------------|:----------------|:-------------------------------------------------------------|
|
||||
| **Architektur** | `linux/arm64` | Native Architektur von Zora (CIX P1 / CP8180). |
|
||||
| **Hypervisor** | Proxmox VE 8.4.10 | `pve.mo-code.at` — Web-UI: `https://pve.mo-code.at:8006` |
|
||||
| **Proxmox-Node-IP** | `10.0.0.20` | SSH: `ssh root@10.0.0.20` |
|
||||
| **Netz-Bridge** | `vmbr0` | Alle VMs und Container im Subnetz `10.0.0.0/24` |
|
||||
| **Gateway (Router)** | `10.0.0.138` | Standard-Gateway für alle VMs/Container |
|
||||
| Parameter | Wert | Erklärung |
|
||||
|:---------------------|:------------------|:---------------------------------------------------------|
|
||||
| **Architektur** | `linux/arm64` | Native Architektur von Zora (CIX P1 / CP8180). |
|
||||
| **Hypervisor** | Proxmox VE 8.4.10 | `pve.mo-code.at` — Web-UI: `https://pve.mo-code.at:8006` |
|
||||
| **Proxmox-Node-IP** | `10.0.0.20` | SSH: `ssh root@10.0.0.20` |
|
||||
| **Netz-Bridge** | `vmbr0` | Alle VMs und Container im Subnetz `10.0.0.0/24` |
|
||||
| **Gateway (Router)** | `10.0.0.138` | Standard-Gateway für alle VMs/Container |
|
||||
|
||||
### VM & Container Übersicht
|
||||
|
||||
@@ -30,77 +30,77 @@ owner: DevOps Engineer
|
||||
### Detaillierte Ressourcen-Konfiguration
|
||||
|
||||
#### CT 100 — pangolin-client (LXC)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:---------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 4 Cores (cpulimit=4) |
|
||||
| **RAM** | 512 MiB + 512 MiB Swap |
|
||||
| **Disk** | 8 GB (`local:100/vm-100-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.21/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1 |
|
||||
| **Autostart** | Ja — order=1, up=30 |
|
||||
| Parameter | Wert |
|
||||
|:--------------|:----------------------------------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 4 Cores (cpulimit=4) |
|
||||
| **RAM** | 512 MiB + 512 MiB Swap |
|
||||
| **Disk** | 8 GB (`local:100/vm-100-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.21/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1 |
|
||||
| **Autostart** | Ja — order=1, up=30 |
|
||||
|
||||
#### CT 101 — gitea (LXC)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:---------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 4 Cores |
|
||||
| **RAM** | 1.00 GiB + 512 MiB Swap |
|
||||
| **Disk** | 20 GB (`local:101/vm-101-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.22/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1 |
|
||||
| **Autostart** | Ja — order=2, up=30 |
|
||||
| Parameter | Wert |
|
||||
|:--------------|:----------------------------------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 4 Cores |
|
||||
| **RAM** | 1.00 GiB + 512 MiB Swap |
|
||||
| **Disk** | 20 GB (`local:101/vm-101-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.22/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1 |
|
||||
| **Autostart** | Ja — order=2, up=30 |
|
||||
|
||||
#### CT 103 — immich (LXC)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:---------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 8 Cores |
|
||||
| **RAM** | 10.00 GiB + 512 MiB Swap |
|
||||
| **Root Disk** | 200 GB (`local:103/vm-103-disk-0.raw`) |
|
||||
| **Mount Point** | mp0: `/mnt/immich_gross` → `/mnt/fotos` (Foto-Bibliothek) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.24/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1, keyctl=1, fuse=1 |
|
||||
| **Autostart** | Ja — order=3, up=30 |
|
||||
| Parameter | Wert |
|
||||
|:----------------|:----------------------------------------------------------------|
|
||||
| **OS** | Ubuntu, arm64 |
|
||||
| **CPU** | 8 Cores |
|
||||
| **RAM** | 10.00 GiB + 512 MiB Swap |
|
||||
| **Root Disk** | 200 GB (`local:103/vm-103-disk-0.raw`) |
|
||||
| **Mount Point** | mp0: `/mnt/immich_gross` → `/mnt/fotos` (Foto-Bibliothek) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.24/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1, keyctl=1, fuse=1 |
|
||||
| **Autostart** | Ja — order=3, up=30 |
|
||||
|
||||
#### CT 120 — ai-stack (LXC)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:---------------------------------------|
|
||||
| **OS** | Ubuntu 24.04, arm64 |
|
||||
| **CPU** | 10 Cores (cpulimit=10, cpuunits=1024) |
|
||||
| **RAM** | 48.00 GiB + 4.00 GiB Swap |
|
||||
| **Disk** | 200 GB (`local:120/vm-120-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.60/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1, keyctl=1 |
|
||||
| **Autostart** | Nein |
|
||||
| **Dienste** | Ollama :11434, Open WebUI :3001 |
|
||||
| Parameter | Wert |
|
||||
|:--------------|:----------------------------------------------------------------|
|
||||
| **OS** | Ubuntu 24.04, arm64 |
|
||||
| **CPU** | 10 Cores (cpulimit=10, cpuunits=1024) |
|
||||
| **RAM** | 48.00 GiB + 4.00 GiB Swap |
|
||||
| **Disk** | 200 GB (`local:120/vm-120-disk-0.raw`) |
|
||||
| **Netzwerk** | eth0 → vmbr0, IP `10.0.0.60/24`, GW `10.0.0.138`, Firewall: Yes |
|
||||
| **Typ** | Unprivileged, nesting=1, keyctl=1 |
|
||||
| **Autostart** | Nein |
|
||||
| **Dienste** | Ollama :11434, Open WebUI :3001 |
|
||||
|
||||
#### VM 110 — meldestelle-host (QEMU/KVM)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:-----------------------------------------------------------------|
|
||||
| **BIOS** | OVMF (UEFI) |
|
||||
| **Machine** | virt (ARM64, aarch64) |
|
||||
| **CPU** | 8 Cores (1 Socket, host-type, numa=1) |
|
||||
| **RAM** | 16.00 GiB (balloon=0, kein Dynamic Memory) |
|
||||
| **Disk** | 150 GB SSD (`local:110/vm-110-disk-1.qcow2`, aio=io_uring, iothread=1, ssd=1) |
|
||||
| **EFI Disk** | `local:110/vm-110-disk-0.qcow2`, efitype=4m, 64 MB |
|
||||
| **Netzwerk** | virtio, bridge=vmbr0, Firewall: Yes |
|
||||
| **SCSI** | VirtIO SCSI single |
|
||||
| **Autostart** | Nein (order=any) |
|
||||
| **QEMU Agent** | Enabled |
|
||||
| **Dienste** | Docker App-Stack (API :8081, Keycloak :8180, Prometheus :9090, Grafana :3000) |
|
||||
| Parameter | Wert |
|
||||
|:---------------|:------------------------------------------------------------------------------|
|
||||
| **BIOS** | OVMF (UEFI) |
|
||||
| **Machine** | virt (ARM64, aarch64) |
|
||||
| **CPU** | 8 Cores (1 Socket, host-type, numa=1) |
|
||||
| **RAM** | 16.00 GiB (balloon=0, kein Dynamic Memory) |
|
||||
| **Disk** | 150 GB SSD (`local:110/vm-110-disk-1.qcow2`, aio=io_uring, iothread=1, ssd=1) |
|
||||
| **EFI Disk** | `local:110/vm-110-disk-0.qcow2`, efitype=4m, 64 MB |
|
||||
| **Netzwerk** | virtio, bridge=vmbr0, Firewall: Yes |
|
||||
| **SCSI** | VirtIO SCSI single |
|
||||
| **Autostart** | Nein (order=any) |
|
||||
| **QEMU Agent** | Enabled |
|
||||
| **Dienste** | Docker App-Stack (API :8081, Keycloak :8180, Prometheus :9090, Grafana :3000) |
|
||||
|
||||
#### VM 102 — gitea-runner (QEMU/KVM)
|
||||
| Parameter | Wert |
|
||||
|:-----------------|:-----------------------------------------------------------------|
|
||||
| **BIOS** | OVMF (UEFI) |
|
||||
| **Machine** | virt (ARM64) |
|
||||
| **CPU** | 8 Cores (1 Socket, host-type, numa=1) |
|
||||
| **RAM** | 16.00 GiB (balloon=0, kein Dynamic Memory) |
|
||||
| **Disk** | 50 GB SSD (`local:102/vm-102-disk-1.qcow2`, aio=io_uring, iothread=1) |
|
||||
| **EFI Disk** | `local:102/vm-102-disk-0.qcow2`, efitype=4m, 64 MB |
|
||||
| **Netzwerk** | virtio, bridge=vmbr0, Firewall: Yes |
|
||||
| **SCSI** | VirtIO SCSI single |
|
||||
| Parameter | Wert |
|
||||
|:-------------|:----------------------------------------------------------------------|
|
||||
| **BIOS** | OVMF (UEFI) |
|
||||
| **Machine** | virt (ARM64) |
|
||||
| **CPU** | 8 Cores (1 Socket, host-type, numa=1) |
|
||||
| **RAM** | 16.00 GiB (balloon=0, kein Dynamic Memory) |
|
||||
| **Disk** | 50 GB SSD (`local:102/vm-102-disk-1.qcow2`, aio=io_uring, iothread=1) |
|
||||
| **EFI Disk** | `local:102/vm-102-disk-0.qcow2`, efitype=4m, 64 MB |
|
||||
| **Netzwerk** | virtio, bridge=vmbr0, Firewall: Yes |
|
||||
| **SCSI** | VirtIO SCSI single |
|
||||
|
||||
## 2. Mail-Relay (SSoT Identity)
|
||||
|
||||
@@ -112,13 +112,13 @@ Diese Daten müssen in der Spring Boot `application.yml` oder `.env` abgeglichen
|
||||
|
||||
## 3. Docker-Image Checkliste (ARM64 Kompatibilität)
|
||||
|
||||
| Dienst | Empfohlenes Image | Status |
|
||||
|:---------------|:-------------------------------------------|:-----------------------------------------------|
|
||||
| **Datenbank** | `postgres:16-alpine` | ARM64 Support: Ja |
|
||||
| **Cache** | `valkey/valkey:9-alpine` | ARM64 Support: Ja (Besserer Support als Redis) |
|
||||
| **Identity** | `quay.io/keycloak/keycloak:26.4` | ARM64 Support: Ja (Offiziell) |
|
||||
| **Monitoring** | `prom/prometheus:v3.7.3` | ARM64 Support: Ja |
|
||||
| **Dashboards** | `grafana/grafana:12.3` | ARM64 Support: Ja |
|
||||
| Dienst | Empfohlenes Image | Status |
|
||||
|:---------------|:-----------------------------------|:------------------------------|
|
||||
| **Datenbank** | `postgres:16-alpine` | ARM64 Support: Ja |
|
||||
| **Cache** | `valkey/valkey:9-alpine` | ARM64 Support: Ja |
|
||||
| **Identity** | `quay.io/keycloak/keycloak:26.5.5` | ARM64 Support: Ja (Offiziell) |
|
||||
| **Monitoring** | `prom/prometheus:v3.7.3` | ARM64 Support: Ja |
|
||||
| **Dashboards** | `grafana/grafana:12.3` | ARM64 Support: Ja |
|
||||
|
||||
## 4. Backend & Gateway (Spring Boot)
|
||||
|
||||
|
||||
@@ -24,14 +24,14 @@ Die Integrationstests des `ping-service` gegen die Docker-Umgebung waren erfolgr
|
||||
|
||||
## 2. Komponenten-Status
|
||||
|
||||
| Service | Status | Port (Host) | Bemerkung |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| **PostgreSQL** | ✅ Healthy | `5432` | Keycloak-Schema & `ping-service` DB (`pingdb`) aktiv. |
|
||||
| **Redis** | ✅ Healthy | `6379` | Cache für Services bereit. |
|
||||
| **Keycloak** | ✅ Running | `8180` | Realm `meldestelle` aktiv. JWT-Validierung durch Backend erfolgreich. |
|
||||
| **Consul** | ✅ Healthy | `8500` | Service Discovery funktioniert. |
|
||||
| **Zipkin** | ✅ Running | `9411` | Tracing-Server bereit. |
|
||||
| **Mailpit** | ✅ Running | `8025` | SMTP-Mock bereit. |
|
||||
| Service | Status | Port (Host) | Bemerkung |
|
||||
|:---------------|:----------|:------------|:----------------------------------------------------------------------|
|
||||
| **PostgreSQL** | ✅ Healthy | `5432` | Keycloak-Schema & `ping-service` DB (`pingdb`) aktiv. |
|
||||
| **Redis** | ✅ Healthy | `6379` | Cache für Services bereit. |
|
||||
| **Keycloak** | ✅ Running | `8180` | Realm `meldestelle` aktiv. JWT-Validierung durch Backend erfolgreich. |
|
||||
| **Consul** | ✅ Healthy | `8500` | Service Discovery funktioniert. |
|
||||
| **Zipkin** | ✅ Running | `9411` | Tracing-Server bereit. |
|
||||
| **Mailpit** | ✅ Running | `8025` | SMTP-Mock bereit. |
|
||||
|
||||
## 3. Durchgeführte Maßnahmen (DevOps)
|
||||
|
||||
|
||||
@@ -15,35 +15,35 @@ erfassen und ein vollständiges, ausführbares Konfigurationsrunbook erstellen.
|
||||
## Erkenntnisse aus User-Feedback
|
||||
|
||||
### VM 102 (Gitea-Runner — `10.0.0.23`)
|
||||
| Punkt | Status | Detail |
|
||||
|:---|:---|:---|
|
||||
| `daemon.json` | ✅ OK | `insecure-registries: ["10.0.0.22:3000"]` gesetzt und verifiziert |
|
||||
| `gitea-runner.service` | ❌ FEHLT | Binary (`act_runner`) nie installiert — Service existiert nicht |
|
||||
| Punkt | Status | Detail |
|
||||
|:-----------------------|:--------|:------------------------------------------------------------------|
|
||||
| `daemon.json` | ✅ OK | `insecure-registries: ["10.0.0.22:3000"]` gesetzt und verifiziert |
|
||||
| `gitea-runner.service` | ❌ FEHLT | Binary (`act_runner`) nie installiert — Service existiert nicht |
|
||||
|
||||
**Root Cause:** Der Gitea Actions Runner wurde bisher nur als Prozess gestartet (oder gar nicht),
|
||||
nie als systemd-Service mit Binary aus den offiziellen `act_runner`-Releases eingerichtet.
|
||||
|
||||
### Gitea CT 101 (`10.0.0.22`)
|
||||
| Punkt | Status |
|
||||
|:---|:---|
|
||||
| Registry-Packages (4x Images) | ✅ Vorhanden (Screenshot bestätigt) |
|
||||
| Org-Secrets `REGISTRY_USER` + `REGISTRY_TOKEN` | ✅ Gesetzt (Screenshot bestätigt) |
|
||||
| Punkt | Status |
|
||||
|:-----------------------------------------------|:-----------------------------------|
|
||||
| Registry-Packages (4x Images) | ✅ Vorhanden (Screenshot bestätigt) |
|
||||
| Org-Secrets `REGISTRY_USER` + `REGISTRY_TOKEN` | ✅ Gesetzt (Screenshot bestätigt) |
|
||||
|
||||
### VM 110 (Meldestelle-Host — `10.0.0.50`)
|
||||
| Punkt | Status | Detail |
|
||||
|:---|:---|:---|
|
||||
| `.env` befüllt | ⚠️ Teilweise | Echte Werte für Ports/Hostnamen OK, aber Passwörter sind noch Placeholder |
|
||||
| `backup.sh` / `deploy.sh` | ✅ Vorhanden | Scripts korrekt implementiert |
|
||||
| Stack gestartet | ❌ Offen | Erst nach Passwort-Fix starten |
|
||||
| Punkt | Status | Detail |
|
||||
|:--------------------------|:-------------|:--------------------------------------------------------------------------|
|
||||
| `.env` befüllt | ⚠️ Teilweise | Echte Werte für Ports/Hostnamen OK, aber Passwörter sind noch Placeholder |
|
||||
| `backup.sh` / `deploy.sh` | ✅ Vorhanden | Scripts korrekt implementiert |
|
||||
| Stack gestartet | ❌ Offen | Erst nach Passwort-Fix starten |
|
||||
|
||||
**Kritisch:** `.env` enthält `pg-password`, `kc-password`, `gf-password` — **vor Stack-Start ersetzen!**
|
||||
|
||||
### Workflow `.gitea/workflows/docker-publish.yaml`
|
||||
| Punkt | Status |
|
||||
|:---|:---|
|
||||
| `docker/login-action@v3` | ✅ Aktiv |
|
||||
| Punkt | Status |
|
||||
|:---------------------------------------|:-----------------|
|
||||
| `docker/login-action@v3` | ✅ Aktiv |
|
||||
| Alter Workaround (config.json manuell) | ✅ Auskommentiert |
|
||||
| `max-parallel: 1` (OOM-Schutz) | ✅ Gesetzt |
|
||||
| `max-parallel: 1` (OOM-Schutz) | ✅ Gesetzt |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ für die Auswahl und Konfiguration eines Self-Hosted AI-Modells (Ollama auf Zora
|
||||
|
||||
## Erstellte Dokumente
|
||||
|
||||
| Datei | Inhalt |
|
||||
|:------|:-------|
|
||||
| Datei | Inhalt |
|
||||
|:-----------------------------------------------------------------|:---------------------------------|
|
||||
| `docs/01_Architecture/Meldestelle_Tech_Stack_Zusammenfassung.md` | Vollständige Tech-Stack-Referenz |
|
||||
|
||||
---
|
||||
|
||||
@@ -13,9 +13,9 @@ von Zora (Minisforum MS-R1) als Basis für weitere Self-Hosted AI Recherchen.
|
||||
|
||||
## Durchgeführte Änderungen
|
||||
|
||||
| Datei | Aktion | Beschreibung |
|
||||
|:------|:-------|:-------------|
|
||||
| `docs/01_Architecture/Minisforum-MS-R1/Zora_Hardware_Zusammenfassung.md` | NEU | Vollständige Hardware-Referenz (CPU, GPU, NPU, RAM, Ports, Proxmox-Konfiguration, VMs/LXCs, Netzwerk, AI-Potenzial) |
|
||||
| Datei | Aktion | Beschreibung |
|
||||
|:-------------------------------------------------------------------------|:-------|:--------------------------------------------------------------------------------------------------------------------|
|
||||
| `docs/01_Architecture/Minisforum-MS-R1/Zora_Hardware_Zusammenfassung.md` | NEU | Vollständige Hardware-Referenz (CPU, GPU, NPU, RAM, Ports, Proxmox-Konfiguration, VMs/LXCs, Netzwerk, AI-Potenzial) |
|
||||
|
||||
## Inhalt der Zusammenfassung
|
||||
|
||||
|
||||
Reference in New Issue
Block a user