Doku: guests unter pve1/guests statt global.
Verlinkungen angepasst; pve2/guests als Platzhalter. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
root
@@ -18,11 +18,10 @@ DNS intern: `*.iot` → VLAN 40 (z. B. `homeassistant.iot` → 192.168.40.254)
|
||||
```
|
||||
docu/
|
||||
├── README.md ← diese Datei
|
||||
├── guests/ ← Compose & Stack-Config pro VM/CT (ohne Daten)
|
||||
├── migration/ ← Schritt-für-Schritt Updates & Tuning
|
||||
├── shared/ ← übergreifend (MQTT, Git, Netzwerk)
|
||||
├── pve1/ ← nur pve1
|
||||
└── pve2/ ← nur pve2
|
||||
├── pve1/ ← pve1 inkl. guests/ (VM/CT-Stacks)
|
||||
└── pve2/ ← pve2 inkl. guests/ (falls vorhanden)
|
||||
```
|
||||
|
||||
## Shared (beide Hosts)
|
||||
@@ -34,8 +33,7 @@ docu/
|
||||
| [shared/mqtt-homeassistant.md](shared/mqtt-homeassistant.md) | MQTT-Broker, HA Discovery, Credentials |
|
||||
| [shared/git-und-repos.md](shared/git-und-repos.md) | Gitea, Tokens, Clone-Pfade |
|
||||
| [migration/nextcloud-optimierung-und-updates.md](migration/nextcloud-optimierung-und-updates.md) | Nextcloud VM 101: Updates, Tuning, notify_push |
|
||||
| [guests/](guests/) | Docker-Stacks pro Gast (Compose, ohne Volumes/Daten) |
|
||||
| [guests/vm101-ubuntu/docbr0-opnsense-routing.md](guests/vm101-ubuntu/docbr0-opnsense-routing.md) | VM 101: docbr0 Instanz |
|
||||
| [pve1/guests/](pve1/guests/) | pve1: Docker-Stacks pro VM/CT (Compose, ohne Daten) |
|
||||
| [shared/opnsense-docker-subnet-routing.md](shared/opnsense-docker-subnet-routing.md) | How-To: Docker-Subnetz über OPNsense |
|
||||
|
||||
## Code-Repos (separat von dieser Doku)
|
||||
|
||||
+1
-2
@@ -16,9 +16,8 @@
|
||||
| 05 | [05_speicher_wartung.md](05_speicher_wartung.md) | Speicher & Wartung |
|
||||
| 06 | [06_ubuntu-vm-nextcloud.md](06_ubuntu-vm-nextcloud.md) | VM 101 ubuntu, Nextcloud Status & Optimierung |
|
||||
| — | [scripts/](scripts/) | VM-101-Skripte (NAT, Wartungs-Cron, crontab) |
|
||||
| — | [../guests/vm101-ubuntu/](../guests/vm101-ubuntu/) | VM 101 Docker-Stacks (Compose, ohne Daten) |
|
||||
| — | [guests/](guests/) | VM/CT auf pve1: Docker-Stacks (Compose, ohne Daten) |
|
||||
| — | [../shared/opnsense-docker-subnet-routing.md](../shared/opnsense-docker-subnet-routing.md) | How-To: Docker-Subnetz über OPNsense |
|
||||
| — | [../guests/vm101-ubuntu/docbr0-opnsense-routing.md](../guests/vm101-ubuntu/docbr0-opnsense-routing.md) | VM 101 docbr0 (Instanz) |
|
||||
|
||||
## Shared
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ Daten:
|
||||
im Container: /data
|
||||
|
||||
Stack-Pfad auf der VM: /opt/stacks/nextcloud/
|
||||
Compose (Repo): [guests/vm101-ubuntu/stacks/nextcloud/](../guests/vm101-ubuntu/stacks/nextcloud/)
|
||||
Compose (Repo): [guests/vm101-ubuntu/stacks/nextcloud/](guests/vm101-ubuntu/stacks/nextcloud/)
|
||||
Compose (Live): /opt/stacks/nextcloud/compose.yml
|
||||
Nextcloud-Config: /opt/stacks/nextcloud/config/www/nextcloud/config/config.php
|
||||
Image: lscr.io/linuxserver/nextcloud:latest (NC 34.0.0.12 = Hub 26 Spring)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Gäste — Stack-Konfiguration (Compose & Anhang)
|
||||
# Gäste auf pve1 — Stack-Konfiguration (Compose & Anhang)
|
||||
|
||||
Compose-Dateien und stack-relevante Konfiguration **ohne** Volumes, Datenbanken, App-Daten oder Secrets.
|
||||
|
||||
@@ -12,7 +12,7 @@ Passwörter in den Repo-Dateien sind durch `REDACTED` ersetzt. Live-Werte nur au
|
||||
|
||||
| Gast | Routing / OPNsense |
|
||||
|------|-------------------|
|
||||
| *(allgemein)* | [../shared/opnsense-docker-subnet-routing.md](../shared/opnsense-docker-subnet-routing.md) |
|
||||
| *(allgemein)* | [../../shared/opnsense-docker-subnet-routing.md](../../shared/opnsense-docker-subnet-routing.md) |
|
||||
| [vm101-ubuntu](vm101-ubuntu/) | [docbr0-opnsense-routing.md](vm101-ubuntu/docbr0-opnsense-routing.md) |
|
||||
|
||||
**Sync vom Gast (Beispiel VM 101):**
|
||||
@@ -21,6 +21,6 @@ Passwörter in den Repo-Dateien sind durch `REDACTED` ersetzt. Live-Werte nur au
|
||||
# Von einem Host mit SSH-Zugang — nur Compose + Config, keine Daten
|
||||
rsync -av --exclude='data/' --exclude='db/' --exclude='mysql/' --exclude='gitea/' \
|
||||
--exclude='config/www/' --exclude='config/log/' --exclude='letsencrypt/' \
|
||||
jean@192.168.10.10:/opt/stacks/ ./guests/vm101-ubuntu/stacks-live/
|
||||
jean@192.168.10.10:/opt/stacks/ ./pve1/guests/vm101-ubuntu/stacks-live/
|
||||
# Anschließend Secrets redigieren, dann ins Repo übernehmen
|
||||
```
|
||||
@@ -6,13 +6,13 @@
|
||||
| **IP** | 192.168.10.10 |
|
||||
| **Stacks** | `/opt/stacks/` |
|
||||
| **Stack-UI** | Dockge → `:5001` |
|
||||
| **Docker** | `iptables: false` → [docker-daemon.json](docker-daemon.json), NAT: [../pve1/scripts/vm101-docker-nat-rules.sh](../pve1/scripts/vm101-docker-nat-rules.sh) |
|
||||
| **Docker** | `iptables: false` → [docker-daemon.json](docker-daemon.json), NAT: [../../scripts/vm101-docker-nat-rules.sh](../../scripts/vm101-docker-nat-rules.sh) |
|
||||
|
||||
## Netzwerk `docbr0`
|
||||
|
||||
Externes Docker-Netz für Container mit **festen IPs** (`10.2.2.0/24`).
|
||||
|
||||
**Erreichbarkeit aus LAN/VLANs:** [docbr0-opnsense-routing.md](docbr0-opnsense-routing.md) (Instanz) · [How-To](../../shared/opnsense-docker-subnet-routing.md) (allgemein)
|
||||
**Erreichbarkeit aus LAN/VLANs:** [docbr0-opnsense-routing.md](docbr0-opnsense-routing.md) (Instanz) · [How-To](../../../shared/opnsense-docker-subnet-routing.md) (allgemein)
|
||||
|
||||
| Stack / Service | Container | IP (docbr0) |
|
||||
|-----------------|-----------|-------------|
|
||||
@@ -43,4 +43,4 @@ Externes Docker-Netz für Container mit **festen IPs** (`10.2.2.0/24`).
|
||||
| [sabnzbd](stacks/sabnzbd/) | `compose.yml` | Usenet |
|
||||
| [vaultwarden](stacks/vaultwarden/) | `compose.yml` | Passwortmanager |
|
||||
|
||||
Details Nextcloud-Betrieb: [../../pve1/06_ubuntu-vm-nextcloud.md](../../pve1/06_ubuntu-vm-nextcloud.md)
|
||||
Details Nextcloud-Betrieb: [../../06_ubuntu-vm-nextcloud.md](../../06_ubuntu-vm-nextcloud.md)
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
# docbr0 (10.2.2.0/24) — Routing & OPNsense
|
||||
|
||||
**Instanz:** VM 101 `ubuntu` auf pve1
|
||||
**Allgemeine Anleitung:** [../../shared/opnsense-docker-subnet-routing.md](../../shared/opnsense-docker-subnet-routing.md)
|
||||
**Allgemeine Anleitung:** [../../../shared/opnsense-docker-subnet-routing.md](../../../shared/opnsense-docker-subnet-routing.md)
|
||||
|
||||
---
|
||||
|
||||
@@ -40,7 +40,7 @@ Client (192.168.10.x / andere VLANs)
|
||||
|
||||
## OPNsense (Kurz)
|
||||
|
||||
Siehe [How-To](../../shared/opnsense-docker-subnet-routing.md) für Screenshots-Felder im Detail.
|
||||
Siehe [How-To](../../../shared/opnsense-docker-subnet-routing.md) für Screenshots-Felder im Detail.
|
||||
|
||||
1. Gateway **VM101_DOCKER** → `192.168.10.10` auf LAN/VLAN10
|
||||
2. Route **10.2.2.0/24** via VM101_DOCKER
|
||||
@@ -56,7 +56,7 @@ Siehe [How-To](../../shared/opnsense-docker-subnet-routing.md) für Screenshots-
|
||||
| Bridge | `10.2.2.1/24` auf `docbr0` |
|
||||
| `ip_forward` | `1` |
|
||||
| Docker | `"iptables": false` |
|
||||
| Container-Internet | [vm101-docker-nat-rules.sh](../../pve1/scripts/vm101-docker-nat-rules.sh) |
|
||||
| Container-Internet | [vm101-docker-nat-rules.sh](../../scripts/vm101-docker-nat-rules.sh) |
|
||||
|
||||
```bash
|
||||
ip route | grep 10.2.2
|
||||
@@ -91,5 +91,5 @@ curl -sI http://10.2.2.254
|
||||
| Dokument | Inhalt |
|
||||
|----------|--------|
|
||||
| [README.md](README.md) | Stack-Liste, IP-Tabelle |
|
||||
| [../../pve1/06_ubuntu-vm-nextcloud.md](../../pve1/06_ubuntu-vm-nextcloud.md) | Nextcloud, notify_push |
|
||||
| [../../shared/opnsense-docker-subnet-routing.md](../../shared/opnsense-docker-subnet-routing.md) | Allgemeines How-To |
|
||||
| [../../06_ubuntu-vm-nextcloud.md](../../06_ubuntu-vm-nextcloud.md) | Nextcloud, notify_push |
|
||||
| [../../../shared/opnsense-docker-subnet-routing.md](../../../shared/opnsense-docker-subnet-routing.md) | Allgemeines How-To |
|
||||
+1
-1
@@ -19,4 +19,4 @@ Live: `/opt/stacks/nextcloud/`
|
||||
- `db/` — MariaDB-Daten
|
||||
- `/mnt/nextcloud-data` — NFS User-Daten
|
||||
|
||||
Betrieb & Tuning: [../../../pve1/06_ubuntu-vm-nextcloud.md](../../../pve1/06_ubuntu-vm-nextcloud.md)
|
||||
Betrieb & Tuning: [../../../../06_ubuntu-vm-nextcloud.md](../../../../06_ubuntu-vm-nextcloud.md)
|
||||
@@ -18,6 +18,7 @@
|
||||
| 07 | [07_Storage-Migration-docker.md](07_Storage-Migration-docker.md) | Docker-Storage |
|
||||
| 08 | [08_GPU-Idle-und-Power-Monitoring.md](08_GPU-Idle-und-Power-Monitoring.md) | GPU Idle (Kurz) |
|
||||
| 09 | [09_GPU-Idle-vollstaendig.md](09_GPU-Idle-vollstaendig.md) | GPU Idle (vollständig) |
|
||||
| — | [guests/](guests/) | VM/CT auf pve2: Docker-Stacks (Compose, ohne Daten) |
|
||||
|
||||
## Shared
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Gäste auf pve2 — Stack-Konfiguration
|
||||
|
||||
Compose-Dateien und stack-relevante Konfiguration **ohne** Volumes/Daten — analog [pve1/guests/](../pve1/guests/).
|
||||
|
||||
| Gast | Status |
|
||||
|------|--------|
|
||||
| CT 101 `docker` (Frigate, …) | noch nicht im Repo |
|
||||
|
||||
Live-Stacks auf pve2 bei Bedarf hier unter `ct101-docker/` o. ä. ablegen.
|
||||
@@ -34,7 +34,7 @@ Schema: VLAN-ID oft = drittes Oktett (`192.168.40.0/24` = VLAN 40)
|
||||
|
||||
Details CT/VM-Netze: siehe Host-Doku unter `pve1/` bzw. `pve2/`.
|
||||
|
||||
**Docker-Subnetze hinter einem Host:** allgemeines How-To → [opnsense-docker-subnet-routing.md](opnsense-docker-subnet-routing.md) · Instanz VM 101 → [guests/vm101-ubuntu/docbr0-opnsense-routing.md](../guests/vm101-ubuntu/docbr0-opnsense-routing.md)
|
||||
**Docker-Subnetze hinter einem Host:** allgemeines How-To → [opnsense-docker-subnet-routing.md](opnsense-docker-subnet-routing.md) · Instanz VM 101 → [pve1/guests/vm101-ubuntu/docbr0-opnsense-routing.md](../pve1/guests/vm101-ubuntu/docbr0-opnsense-routing.md)
|
||||
|
||||
## Rollen
|
||||
|
||||
|
||||
@@ -186,7 +186,7 @@ docker ps --filter network=docbr0
|
||||
[ ] OPNsense: Firewall Pass pro Quell-VLAN
|
||||
[ ] Apply Changes
|
||||
[ ] Test: traceroute vom Client
|
||||
[ ] Doku: guests/<gast>/… oder Host-README verlinken
|
||||
[ ] Doku: pveX/guests/<gast>/… oder Host-README verlinken
|
||||
```
|
||||
|
||||
---
|
||||
@@ -195,7 +195,7 @@ docker ps --filter network=docbr0
|
||||
|
||||
| Gast | Docker-Subnetz | Host (Mgmt) | Detail-Doku |
|
||||
|------|----------------|-------------|-------------|
|
||||
| VM 101 ubuntu (pve1) | `10.2.2.0/24` (`docbr0`) | `192.168.10.10` | [guests/vm101-ubuntu/docbr0-opnsense-routing.md](../guests/vm101-ubuntu/docbr0-opnsense-routing.md) |
|
||||
| VM 101 ubuntu (pve1) | `10.2.2.0/24` (`docbr0`) | `192.168.10.10` | [pve1/guests/vm101-ubuntu/docbr0-opnsense-routing.md](../pve1/guests/vm101-ubuntu/docbr0-opnsense-routing.md) |
|
||||
|
||||
Weitere Docker-Hosts: gleiches Muster — eigenes Subnetz wählen, der **Host** wird Gateway (`.1` der Bridge), OPNsense-Route zeigt auf die **Mgmt-IP** des Hosts.
|
||||
|
||||
@@ -206,5 +206,5 @@ Weitere Docker-Hosts: gleiches Muster — eigenes Subnetz wählen, der **Host**
|
||||
| Dokument | Inhalt |
|
||||
|----------|--------|
|
||||
| [infrastruktur-netzwerk.md](infrastruktur-netzwerk.md) | VLANs, Proxmox, OPNsense-Rollen |
|
||||
| [guests/vm101-ubuntu/README.md](../guests/vm101-ubuntu/README.md) | Stacks + docbr0-IP-Tabelle |
|
||||
| [pve1/guests/vm101-ubuntu/README.md](../pve1/guests/vm101-ubuntu/README.md) | Stacks + docbr0-IP-Tabelle |
|
||||
| [pve1/scripts/vm101-docker-nat-rules.sh](../pve1/scripts/vm101-docker-nat-rules.sh) | Container-Internet bei `iptables: false` |
|
||||
|
||||
Reference in New Issue
Block a user