Compare commits
36
Commits
c299d54aff
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d42ba4aa9 | ||
|
|
eddde47f6e | ||
|
|
e1a9b1df3f | ||
|
|
6fad45d632 | ||
|
|
2899a4ef89 | ||
|
|
1fffb2f13e | ||
|
|
292659bfe2 | ||
|
|
7ab467d3dc | ||
|
|
c0f7d9f04e | ||
|
|
9a74068e92 | ||
|
|
2189f460ac | ||
|
|
8063f2a49f | ||
|
|
30adef5687 | ||
|
|
1dec428949 | ||
|
|
58fae430a0 | ||
|
|
0b78895dfb | ||
|
|
5e1c2d590e | ||
|
|
8c7cd6647f | ||
|
|
2bd3cea773 | ||
|
|
22a2be6cc2 | ||
|
|
99cdcd1f63 | ||
|
|
4986f16d2a | ||
|
|
ff5a18ea6b | ||
|
|
3f848d389b | ||
|
|
e7f666c995 | ||
|
|
4aa412b653 | ||
|
|
664e18c952 | ||
|
|
bca67df61f | ||
|
|
00a31363a6 | ||
|
|
12b6b2c312 | ||
|
|
a6e30caf65 | ||
|
|
f9215475da | ||
|
|
76aaeb5161 | ||
|
|
176e8f61ce | ||
|
|
9d84493c6f | ||
|
|
f2c463f2ab |
@@ -19,3 +19,12 @@
|
|||||||
[submodule "package-repo"]
|
[submodule "package-repo"]
|
||||||
path = package-repo
|
path = package-repo
|
||||||
url = https://git.bnhmeijer.nl/bart/package-repo.git
|
url = https://git.bnhmeijer.nl/bart/package-repo.git
|
||||||
|
[submodule "jellyfin-client"]
|
||||||
|
path = jellyfin-client
|
||||||
|
url = https://git.bnhmeijer.nl/bart/jellyfin-client.git
|
||||||
|
[submodule "jellyfinradio"]
|
||||||
|
path = jellyfinradio
|
||||||
|
url = https://github.com/brupje/jellyfinradio.git
|
||||||
|
[submodule "chargeman"]
|
||||||
|
path = chargeman
|
||||||
|
url = https://git.bnhmeijer.nl/bart/chargeman.git
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Lees en volg deze regels nauwkeurig bij het uitvoeren van wijzigingen:
|
|||||||
|
|
||||||
1. **Meta-repository & Submodules (NIET direct in root code committen)**:
|
1. **Meta-repository & Submodules (NIET direct in root code committen)**:
|
||||||
* Deze workspace bestaat uit Git submodules.
|
* Deze workspace bestaat uit Git submodules.
|
||||||
* Wijzigingen aan broncode, configuraties of componenten horen thuis in de betreffende submodule map (`cluster-infra/`, `HERMS/`, `k8s-infra-vmserver/`, `smart-home/`, `htpc/`, `eendoeserver/`, `package-repo/`).
|
* Wijzigingen aan broncode, configuraties of componenten horen thuis in de betreffende submodule map (`cluster-infra/`, `HERMS/`, `k8s-infra-vmserver/`, `smart-home/`, `htpc/`, `eendoeserver/`, `package-repo/`, `jellyfin-client/`, `jellyfinradio/`, `chargeman/`).
|
||||||
* Voer commits altijd uit binnen de submodule zelf (bijv. via `git -C <submodule> commit -m "..."`).
|
* Voer commits altijd uit binnen de submodule zelf (bijv. via `git -C <submodule> commit -m "..."`).
|
||||||
* Pas na het committen in de submodule werk je de submodule-pointer bij in deze root repository (`git add <submodule>` && `git commit`).
|
* Pas na het committen in de submodule werk je de submodule-pointer bij in deze root repository (`git add <submodule>` && `git commit`).
|
||||||
|
|
||||||
@@ -62,6 +62,9 @@ Lees en volg deze regels nauwkeurig bij het uitvoeren van wijzigingen:
|
|||||||
| **`htpc`** | `https://git.bnhmeijer.nl/bart/htpc.git` | Docker, K8s manifests | Jellyfin media server, `*Arr`-suite (Sonarr, Radarr, Lidarr, Prowlarr), download clients |
|
| **`htpc`** | `https://git.bnhmeijer.nl/bart/htpc.git` | Docker, K8s manifests | Jellyfin media server, `*Arr`-suite (Sonarr, Radarr, Lidarr, Prowlarr), download clients |
|
||||||
| **`eendoeserver`** | `https://git.bnhmeijer.nl/bart/eendoeserver.git` | Apache vhosts, HTML, SASS | Website `eendoe.nl` en Apache VirtualHost configuraties van web03 |
|
| **`eendoeserver`** | `https://git.bnhmeijer.nl/bart/eendoeserver.git` | Apache vhosts, HTML, SASS | Website `eendoe.nl` en Apache VirtualHost configuraties van web03 |
|
||||||
| **`package-repo`** | `https://git.bnhmeijer.nl/bart/package-repo.git` | Debian packaging, Gitea Actions | Bronnen, staging en build-pipelines voor debian packages |
|
| **`package-repo`** | `https://git.bnhmeijer.nl/bart/package-repo.git` | Debian packaging, Gitea Actions | Bronnen, staging en build-pipelines voor debian packages |
|
||||||
|
| **`jellyfin-client`** | `https://git.bnhmeijer.nl/bart/jellyfin-client.git` | Python, Rust, MPV, Systemd | Jellyfin client player/kiosk applicatie, MPV controller en remote integraties |
|
||||||
|
| **`jellyfinradio`** | `https://github.com/brupje/jellyfinradio.git` | Python, FFMPEG, Icecast | Radio stream scheduling, Icecast audio/video streaming en integratie met Jellyfin |
|
||||||
|
| **`chargeman`** | `https://git.bnhmeijer.nl/bart/chargeman.git` | Python, D-Bus, MQTT, Tibber API | Thuisbatterij-controller voor Victron (Venus OS): laad-/ontlaadmodi, dynamische P1-nulsturing, goedkoop laden op Tibber-prijs, MQTT-publicatie |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -168,7 +171,7 @@ flowchart TD
|
|||||||
### Submodule & Git Beheer
|
### Submodule & Git Beheer
|
||||||
```bash
|
```bash
|
||||||
# Submodule status en eventuele uncommitted changes inspecteren
|
# Submodule status en eventuele uncommitted changes inspecteren
|
||||||
for d in cluster-infra HERMS k8s-infra-vmserver smart-home htpc eendoeserver package-repo; do
|
for d in cluster-infra HERMS k8s-infra-vmserver smart-home htpc eendoeserver package-repo jellyfin-client jellyfinradio chargeman; do
|
||||||
echo "=== $d ==="
|
echo "=== $d ==="
|
||||||
git -C "$d" status -s
|
git -C "$d" status -s
|
||||||
done
|
done
|
||||||
|
|||||||
Submodule
+1
Submodule chargeman added at 8fd6676d5c
+1
-1
Submodule cluster-infra updated: ad865da5bd...ef669522fc
@@ -90,6 +90,11 @@ De werkmap `/home/bart/git/cluster` is gestructureerd als een **Git superproject
|
|||||||
| **[`HERMS`](file:///home/bart/git/cluster/HERMS)** | Geautomatiseerd brouwplatform (brouwautomatisering) | Rust microservices, Next.js / TypeScript GUI, ESP32 C++, KiCad PCB |
|
| **[`HERMS`](file:///home/bart/git/cluster/HERMS)** | Geautomatiseerd brouwplatform (brouwautomatisering) | Rust microservices, Next.js / TypeScript GUI, ESP32 C++, KiCad PCB |
|
||||||
| **[`smart-home`](file:///home/bart/git/cluster/smart-home)** | Huisautomatisering & IoT | Home Assistant, netwerk- en migratiescripts |
|
| **[`smart-home`](file:///home/bart/git/cluster/smart-home)** | Huisautomatisering & IoT | Home Assistant, netwerk- en migratiescripts |
|
||||||
| **[`htpc`](file:///home/bart/git/cluster/htpc)** | HTPC & Media Services Platform | Jellyfin, *Arr stack, K8s manifests, GitOps |
|
| **[`htpc`](file:///home/bart/git/cluster/htpc)** | HTPC & Media Services Platform | Jellyfin, *Arr stack, K8s manifests, GitOps |
|
||||||
|
| **[`eendoeserver`](file:///home/bart/git/cluster/eendoeserver)** | Web & Reverse Proxy web03 | Apache vhosts, HTML, SASS |
|
||||||
|
| **[`package-repo`](file:///home/bart/git/cluster/package-repo)** | Debian Package Repository | Debian packaging, Gitea Actions |
|
||||||
|
| **[`jellyfin-client`](file:///home/bart/git/cluster/jellyfin-client)** | HTPC Client & YouTube Receiver | Python, Rust, MPV IPC, Kodi JSON-RPC |
|
||||||
|
| **[`jellyfinradio`](file:///home/bart/git/cluster/jellyfinradio)** | Jellyfin Radio & Live Streamer | Python, FFMPEG, Icecast |
|
||||||
|
| **[`chargeman`](file:///home/bart/git/cluster/chargeman)** | Victron thuisbatterij-controller | Python, D-Bus, MQTT, Tibber |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+51
-1
@@ -1,6 +1,6 @@
|
|||||||
# Repository Details & Modules
|
# Repository Details & Modules
|
||||||
|
|
||||||
Dit document bevat specifieke details over de vier repositories in deze workspace, inclusief mappenstructuur, protocollen en configuraties.
|
Dit document bevat specifieke details over de repositories in deze workspace, inclusief mappenstructuur, protocollen en configuraties.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -107,3 +107,53 @@ Dit document bevat specifieke details over de vier repositories in deze workspac
|
|||||||
### GitOps Workflow
|
### GitOps Workflow
|
||||||
* Manifests bevinden zich in `k8s/` en worden via Gitea Actions gesynchroniseerd naar `k8s-infra-vmserver` onder `workloads/htpc/`.
|
* Manifests bevinden zich in `k8s/` en worden via Gitea Actions gesynchroniseerd naar `k8s-infra-vmserver` onder `workloads/htpc/`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 🏢 eendoeserver Repository
|
||||||
|
|
||||||
|
* **Pad**: `/home/bart/git/cluster/eendoeserver`
|
||||||
|
* **Git Remote**: `https://git.bnhmeijer.nl/bart/eendoeserver.git`
|
||||||
|
* **Doel**: Website `eendoe.nl` en Apache VirtualHost configuraties van web03.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 📦 package-repo Repository
|
||||||
|
|
||||||
|
* **Pad**: `/home/bart/git/cluster/package-repo`
|
||||||
|
* **Git Remote**: `https://git.bnhmeijer.nl/bart/package-repo.git`
|
||||||
|
* **Doel**: Debian/APT package repository bronnen, build-scripts en distributie.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 📺 jellyfin-client Repository
|
||||||
|
|
||||||
|
* **Pad**: `/home/bart/git/cluster/jellyfin-client`
|
||||||
|
* **Git Remote**: `https://git.bnhmeijer.nl/bart/jellyfin-client.git`
|
||||||
|
* **Doel**: HTPC client applicatie & YouTube video receiver voor Linux mini-PC's.
|
||||||
|
* **Componenten**:
|
||||||
|
* Python WebSocket client sessie gekoppeld aan de centrale Jellyfin server.
|
||||||
|
* MPV video player controller met hardwareversnelling via IPC unix socket.
|
||||||
|
* Geëmuleerde Kodi JSON-RPC server (`:8080`, `:9090`) voor bediening via Yatse.
|
||||||
|
* Web remote / REST API (`:8097`) voor mobiel YouTube links delen (`yt-dlp`).
|
||||||
|
* `jellyfin-kiosk-rs`: Rust-gebaseerde kiosk launcher.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. 📻 jellyfinradio Repository
|
||||||
|
|
||||||
|
* **Pad**: `/home/bart/git/cluster/jellyfinradio`
|
||||||
|
* **Git Remote**: `https://github.com/brupje/jellyfinradio.git`
|
||||||
|
* **Doel**: Radio stream scheduler, Icecast streamer en audio/video rendering gekoppeld aan Jellyfin.
|
||||||
|
* **Componenten**:
|
||||||
|
* Python webserver en scheduler voor radio streams.
|
||||||
|
* Icecast watcher & audio/video writers via FFmpeg.
|
||||||
|
* Jellyfin API client integratie voor playlists en media selectie.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 10. 🔋 chargeman Repository
|
||||||
|
|
||||||
|
* **Pad**: `/home/bart/git/cluster/chargeman`
|
||||||
|
* **Git Remote**: `https://git.bnhmeijer.nl/bart/chargeman.git`
|
||||||
|
* **Stack**: Python (D-Bus, paho-mqtt, pyTibber), draait op een Victron Venus OS (`/data`).
|
||||||
|
* **Doel**: Stuurt de Victron-omvormer/accu aan via D-Bus (setpoint, feed-in/charge aan/uit) op basis van chargemode (floating, handmatig, max, goedkoop via Tibber, dynamisch P1-gestuurd), met status via MQTT (broker `10.2.0.15`).
|
||||||
|
|||||||
+1
-1
Submodule htpc updated: 43c54f18b8...b5750423ed
Submodule
+1
Submodule jellyfin-client added at a795c3d024
Submodule
+1
Submodule jellyfinradio added at b225941c53
+1
-1
Submodule k8s-infra-vmserver updated: 5bdc869347...35cb9419b9
+1
-1
Submodule package-repo updated: 6ee1625e70...ee9ceb4256
Reference in New Issue
Block a user