Compare commits
1 Commits
30b2fff775
...
feature/op
| Author | SHA1 | Date | |
|---|---|---|---|
| 2198c33898 |
@@ -1,103 +0,0 @@
|
|||||||
using GerbilManagerWebAPI.Endpoints;
|
|
||||||
|
|
||||||
namespace GerbilManager.Tests;
|
|
||||||
|
|
||||||
/// <summary>WEB-2: POST /api/publish — atomic swap, file layout, staging cleanup.</summary>
|
|
||||||
public class CmsPublishTests
|
|
||||||
{
|
|
||||||
private static string TempRoot() =>
|
|
||||||
Path.Combine(Path.GetTempPath(), "gm-publish-test-" + Guid.NewGuid().ToString("N"));
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task Publish_erstellt_live_Verzeichnis_mit_allen_Dateien()
|
|
||||||
{
|
|
||||||
var root = TempRoot();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var files = new Dictionary<string, string>
|
|
||||||
{
|
|
||||||
["index.html"] = "<html>start</html>",
|
|
||||||
["kontakt/index.html"] = "<html>kontakt</html>",
|
|
||||||
["assets/site.css"] = "body {}",
|
|
||||||
};
|
|
||||||
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(files, root);
|
|
||||||
|
|
||||||
Assert.True(File.Exists(Path.Combine(root, "live", "index.html")));
|
|
||||||
Assert.True(File.Exists(Path.Combine(root, "live", "kontakt", "index.html")));
|
|
||||||
Assert.True(File.Exists(Path.Combine(root, "live", "assets", "site.css")));
|
|
||||||
Assert.Equal("<html>start</html>",
|
|
||||||
await File.ReadAllTextAsync(Path.Combine(root, "live", "index.html")));
|
|
||||||
}
|
|
||||||
finally { if (Directory.Exists(root)) Directory.Delete(root, true); }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task Publish_atomarer_Swap_ueberschreibt_alte_live_Version()
|
|
||||||
{
|
|
||||||
var root = TempRoot();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(
|
|
||||||
new Dictionary<string, string> { ["index.html"] = "version-1" }, root);
|
|
||||||
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(
|
|
||||||
new Dictionary<string, string> { ["index.html"] = "version-2" }, root);
|
|
||||||
|
|
||||||
var content = await File.ReadAllTextAsync(Path.Combine(root, "live", "index.html"));
|
|
||||||
Assert.Equal("version-2", content);
|
|
||||||
}
|
|
||||||
finally { if (Directory.Exists(root)) Directory.Delete(root, true); }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task Publish_kein_staging_oder_old_Verzeichnis_nach_Swap()
|
|
||||||
{
|
|
||||||
var root = TempRoot();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(
|
|
||||||
new Dictionary<string, string> { ["index.html"] = "x" }, root);
|
|
||||||
|
|
||||||
Assert.False(Directory.Exists(Path.Combine(root, "_staging_new")));
|
|
||||||
Assert.False(Directory.Exists(Path.Combine(root, "_old")));
|
|
||||||
}
|
|
||||||
finally { if (Directory.Exists(root)) Directory.Delete(root, true); }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task Publish_mehrfach_ohne_Fehler()
|
|
||||||
{
|
|
||||||
var root = TempRoot();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
for (int i = 1; i <= 3; i++)
|
|
||||||
{
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(
|
|
||||||
new Dictionary<string, string> { ["index.html"] = $"v{i}" }, root);
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.Equal("v3",
|
|
||||||
await File.ReadAllTextAsync(Path.Combine(root, "live", "index.html")));
|
|
||||||
}
|
|
||||||
finally { if (Directory.Exists(root)) Directory.Delete(root, true); }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public async Task Publish_UTF8_Inhalt_korrekt_gespeichert()
|
|
||||||
{
|
|
||||||
var root = TempRoot();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
const string german = "<html>Züchter — Rennmäuse & mehr</html>";
|
|
||||||
await CmsEndpoints.PublishToDirectoryAsync(
|
|
||||||
new Dictionary<string, string> { ["index.html"] = german }, root);
|
|
||||||
|
|
||||||
var content = await File.ReadAllTextAsync(
|
|
||||||
Path.Combine(root, "live", "index.html"),
|
|
||||||
System.Text.Encoding.UTF8);
|
|
||||||
Assert.Equal(german, content);
|
|
||||||
}
|
|
||||||
finally { if (Directory.Exists(root)) Directory.Delete(root, true); }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
namespace GerbilManagerWebAPI.Cms
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// WEB-2: path where POST /api/publish writes the rendered static site.
|
|
||||||
/// Env var: PublicSite__RootPath (empty = publish disabled, returns 503).
|
|
||||||
/// In production this volume is shared with the publicsite-nginx container.
|
|
||||||
/// </summary>
|
|
||||||
public sealed class PublicSiteOptions
|
|
||||||
{
|
|
||||||
public const string SectionName = "PublicSite";
|
|
||||||
|
|
||||||
public string? RootPath { get; set; }
|
|
||||||
|
|
||||||
public bool IsConfigured => !string.IsNullOrWhiteSpace(RootPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Nodes;
|
using System.Text.Json.Nodes;
|
||||||
using GerbilManagerWebAPI.Cms;
|
using GerbilManagerWebAPI.Cms;
|
||||||
@@ -6,7 +5,6 @@ using GerbilManagerWebAPI.Dtos;
|
|||||||
using GerbilManagerWebAPI.Models;
|
using GerbilManagerWebAPI.Models;
|
||||||
using Microsoft.AspNetCore.Http.HttpResults;
|
using Microsoft.AspNetCore.Http.HttpResults;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
|
|
||||||
namespace GerbilManagerWebAPI.Endpoints
|
namespace GerbilManagerWebAPI.Endpoints
|
||||||
{
|
{
|
||||||
@@ -34,21 +32,6 @@ namespace GerbilManagerWebAPI.Endpoints
|
|||||||
return TypedResults.Ok(files.Select(kv => new { path = kv.Key, size = kv.Value.Length }).ToList());
|
return TypedResults.Ok(files.Select(kv => new { path = kv.Key, size = kv.Value.Length }).ToList());
|
||||||
});
|
});
|
||||||
|
|
||||||
// ---- WEB-2: publish — rendert Snapshot auf Disk, atomic swap live/ ----
|
|
||||||
api.MapPost("/publish", async (ApplicationContext db, IOptions<PublicSiteOptions> opts) =>
|
|
||||||
{
|
|
||||||
if (!opts.Value.IsConfigured)
|
|
||||||
return Results.Problem(
|
|
||||||
detail: "PublicSite__RootPath ist nicht konfiguriert. Setze die Umgebungsvariable.",
|
|
||||||
statusCode: 503,
|
|
||||||
title: "PublicSite nicht konfiguriert");
|
|
||||||
|
|
||||||
var snapshot = await new SiteSnapshotService(db).BuildAsync();
|
|
||||||
var files = SiteRenderer.Render(snapshot);
|
|
||||||
await PublishToDirectoryAsync(files, opts.Value.RootPath!);
|
|
||||||
return Results.Ok(new { filesPublished = files.Count });
|
|
||||||
});
|
|
||||||
|
|
||||||
// ---- WEB-3: lokale Vorschau — rendert live (nur veröffentlichte Seiten)
|
// ---- WEB-3: lokale Vorschau — rendert live (nur veröffentlichte Seiten)
|
||||||
// und liefert die Datei mit passendem Content-Type aus. Relative
|
// und liefert die Datei mit passendem Content-Type aus. Relative
|
||||||
// Links/CSS der gerenderten Seite funktionieren dadurch im
|
// Links/CSS der gerenderten Seite funktionieren dadurch im
|
||||||
@@ -186,36 +169,6 @@ namespace GerbilManagerWebAPI.Endpoints
|
|||||||
return app;
|
return app;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// WEB-2: Writes rendered files to <paramref name="rootPath"/>/_staging_new, then
|
|
||||||
/// atomically swaps to live/ (rename on the same filesystem = one syscall, never partial).
|
|
||||||
/// </summary>
|
|
||||||
internal static async Task PublishToDirectoryAsync(
|
|
||||||
IReadOnlyDictionary<string, string> files, string rootPath)
|
|
||||||
{
|
|
||||||
var stagingDir = Path.Combine(rootPath, "_staging_new");
|
|
||||||
var liveDir = Path.Combine(rootPath, "live");
|
|
||||||
var oldDir = Path.Combine(rootPath, "_old");
|
|
||||||
|
|
||||||
if (Directory.Exists(stagingDir)) Directory.Delete(stagingDir, recursive: true);
|
|
||||||
Directory.CreateDirectory(stagingDir);
|
|
||||||
|
|
||||||
foreach (var (relativePath, content) in files)
|
|
||||||
{
|
|
||||||
var normalPath = relativePath.Replace('/', Path.DirectorySeparatorChar);
|
|
||||||
var fullPath = Path.Combine(stagingDir, normalPath);
|
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(fullPath)!);
|
|
||||||
await File.WriteAllTextAsync(fullPath, content, Encoding.UTF8);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Atomic swap: _staging_new → live
|
|
||||||
if (Directory.Exists(oldDir)) Directory.Delete(oldDir, recursive: true);
|
|
||||||
if (Directory.Exists(liveDir)) Directory.Move(liveDir, oldDir);
|
|
||||||
Directory.Move(stagingDir, liveDir);
|
|
||||||
try { if (Directory.Exists(oldDir)) Directory.Delete(oldDir, recursive: true); }
|
|
||||||
catch { /* non-fatal — old dir gone on next publish */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>WEB-3: Content-Type der Vorschau-Dateien (Renderer erzeugt HTML + CSS).</summary>
|
/// <summary>WEB-3: Content-Type der Vorschau-Dateien (Renderer erzeugt HTML + CSS).</summary>
|
||||||
private static string PreviewContentType(string path) =>
|
private static string PreviewContentType(string path) =>
|
||||||
path.EndsWith(".css", StringComparison.OrdinalIgnoreCase) ? "text/css; charset=utf-8"
|
path.EndsWith(".css", StringComparison.OrdinalIgnoreCase) ? "text/css; charset=utf-8"
|
||||||
|
|||||||
@@ -48,9 +48,6 @@ builder.Services.AddHttpClient<GerbilManagerWebAPI.Inbox.DraftReplyService>(
|
|||||||
// FEAT-NAMEGEN: Name suggestions via Gemini (same AI section, same wire client).
|
// FEAT-NAMEGEN: Name suggestions via Gemini (same AI section, same wire client).
|
||||||
builder.Services.AddHttpClient<GerbilManagerWebAPI.Names.NameSuggestionService>(
|
builder.Services.AddHttpClient<GerbilManagerWebAPI.Names.NameSuggestionService>(
|
||||||
http => http.Timeout = TimeSpan.FromSeconds(60));
|
http => http.Timeout = TimeSpan.FromSeconds(60));
|
||||||
// WEB-2: public site publish path (env var PublicSite__RootPath; empty = disabled)
|
|
||||||
builder.Services.AddOptions<GerbilManagerWebAPI.Cms.PublicSiteOptions>()
|
|
||||||
.BindConfiguration(GerbilManagerWebAPI.Cms.PublicSiteOptions.SectionName);
|
|
||||||
|
|
||||||
// INBOX-0: Gmail inbox. App Password encrypted at rest via Data Protection.
|
// INBOX-0: Gmail inbox. App Password encrypted at rest via Data Protection.
|
||||||
// AR-3: persist the key ring so encrypted passwords survive image redeployments.
|
// AR-3: persist the key ring so encrypted passwords survive image redeployments.
|
||||||
|
|||||||
@@ -7,25 +7,20 @@ POSTGRES_PASSWORD=aendere_mich_bitte
|
|||||||
# Externer Port fuer das Frontend (Standard: 80)
|
# Externer Port fuer das Frontend (Standard: 80)
|
||||||
PORT=80
|
PORT=80
|
||||||
|
|
||||||
# Gitea Container Registry (Standard: truenas:13000/gulum)
|
# Container Registry (git.rismer.de/gulum)
|
||||||
REGISTRY=truenas:13000/gulum
|
REGISTRY=git.rismer.de/gulum
|
||||||
TAG=latest
|
TAG=latest
|
||||||
|
|
||||||
# NAS-Dataset-Pfade (TrueNAS SCALE: /mnt/<Pool>/<Dataset>)
|
# NAS-Dataset-Pfade (TrueNAS SCALE Goldeye: /mnt/JailStorage/DockerVolumes/...)
|
||||||
PGDATA_PATH=/mnt/SSD/gerbil/pgdata
|
PGDATA_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
PHOTOS_PATH=/mnt/SSD/gerbil/photos
|
PHOTOS_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/photos
|
||||||
BACKUPS_PATH=/mnt/SSD/gerbil/backups
|
BACKUPS_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/backups
|
||||||
# AR-3: Data Protection Key-Ring (Gmail-App-Passwort-Verschlüsselung)
|
# AR-3: Data Protection Key-Ring (Gmail-App-Passwort-Verschlüsselung)
|
||||||
KEYS_PATH=/mnt/SSD/gerbil/keys
|
KEYS_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/keys
|
||||||
|
|
||||||
# Backup-Rotation: Anzahl Tage (Standard: 7)
|
# Backup-Rotation: Anzahl Tage (Standard: 7)
|
||||||
BACKUP_KEEP_DAYS=7
|
BACKUP_KEEP_DAYS=7
|
||||||
|
|
||||||
# WEB-2: Oeffentliche Webseite (Shared Volume: api schreibt, publicsite-nginx liest)
|
|
||||||
PUBLICSITE_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/publicsite
|
|
||||||
# Port fuer den publicsite-nginx (Julian's externer nginx leitet darauf weiter)
|
|
||||||
PUBLICSITE_PORT=8081
|
|
||||||
|
|
||||||
# KI-Funktionen (Verkaufstext + Posteingang-Entwurf)
|
# KI-Funktionen (Verkaufstext + Posteingang-Entwurf)
|
||||||
# Beliebiger OpenAI-kompatibler Anbieter — Optionen in docs/ai-provider.md
|
# Beliebiger OpenAI-kompatibler Anbieter — Optionen in docs/ai-provider.md
|
||||||
# Leer lassen = KI deaktiviert (kein Fehler, nur 503 AiKeyMissing)
|
# Leer lassen = KI deaktiviert (kein Fehler, nur 503 AiKeyMissing)
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
|
|
||||||
# --- .NET API (GerbilManagerWebAPI) ---
|
# --- .NET API (GerbilManagerWebAPI) ---
|
||||||
api:
|
api:
|
||||||
image: "${REGISTRY:-truenas:13000/gulum}/gerbilmanager-api:${TAG:-latest}"
|
image: "${REGISTRY:-git.rismer.de/gulum}/gerbilmanager-api:${TAG:-latest}"
|
||||||
build:
|
build:
|
||||||
context: ../..
|
context: ../..
|
||||||
dockerfile: GerbilManagerWebAPI/Dockerfile
|
dockerfile: GerbilManagerWebAPI/Dockerfile
|
||||||
@@ -48,12 +48,9 @@ services:
|
|||||||
AI__BaseUrl: "${AI__BaseUrl:-}"
|
AI__BaseUrl: "${AI__BaseUrl:-}"
|
||||||
AI__ApiKey: "${AI__ApiKey:-}"
|
AI__ApiKey: "${AI__ApiKey:-}"
|
||||||
AI__Model: "${AI__Model:-gemini-flash-latest}"
|
AI__Model: "${AI__Model:-gemini-flash-latest}"
|
||||||
# WEB-2: Pfad wo POST /api/publish die oeffentliche Seite hinschreibt
|
|
||||||
PublicSite__RootPath: /data/publicsite
|
|
||||||
volumes:
|
volumes:
|
||||||
- photos:/data/photos
|
- photos:/data/photos
|
||||||
- keys:/data/keys
|
- keys:/data/keys
|
||||||
- publicsite:/data/publicsite
|
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -66,7 +63,7 @@ services:
|
|||||||
|
|
||||||
# --- nginx Frontend (React SPA + API-Proxy) ---
|
# --- nginx Frontend (React SPA + API-Proxy) ---
|
||||||
frontend:
|
frontend:
|
||||||
image: "${REGISTRY:-truenas:13000/gulum}/gerbilmanager-frontend:${TAG:-latest}"
|
image: "${REGISTRY:-git.rismer.de/gulum}/gerbilmanager-frontend:${TAG:-latest}"
|
||||||
build:
|
build:
|
||||||
context: ../..
|
context: ../..
|
||||||
dockerfile: gerbil-manager-web/Dockerfile
|
dockerfile: gerbil-manager-web/Dockerfile
|
||||||
@@ -77,21 +74,6 @@ services:
|
|||||||
api:
|
api:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
# --- nginx Public Site (WEB-2) ---
|
|
||||||
# Serviert NUR die statische oeffentliche Seite (live/ aus dem publicsite-Volume).
|
|
||||||
# SICHERHEIT: Kein Proxy auf api/frontend — nur statisches HTML nach aussen.
|
|
||||||
# Julian's externer nginx-Proxy leitet <DOMAIN> auf Port 8081 weiter.
|
|
||||||
publicsite:
|
|
||||||
image: nginx:alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "${PUBLICSITE_PORT:-8081}:80"
|
|
||||||
volumes:
|
|
||||||
- publicsite:/usr/share/nginx/html:ro
|
|
||||||
- ./nginx/publicsite.conf:/etc/nginx/conf.d/default.conf:ro
|
|
||||||
depends_on:
|
|
||||||
- api
|
|
||||||
|
|
||||||
# --- Backup-Sidecar (taeglicher pg_dump + Foto-Archiv + Rotation) ---
|
# --- Backup-Sidecar (taeglicher pg_dump + Foto-Archiv + Rotation) ---
|
||||||
backup:
|
backup:
|
||||||
image: postgres:17-alpine
|
image: postgres:17-alpine
|
||||||
@@ -113,19 +95,19 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
# NAS-Datasets als Bind-Mounts (Pfade in .env konfigurieren).
|
# NAS-Datasets als Bind-Mounts (Pfade in .env konfigurieren).
|
||||||
# TrueNAS: Dataset-Pfad z.B. /mnt/SSD/gerbil/pgdata
|
# TrueNAS Goldeye: /mnt/JailStorage/DockerVolumes/gerbilmanager/<name>
|
||||||
pgdata:
|
pgdata:
|
||||||
driver: local
|
driver: local
|
||||||
driver_opts:
|
driver_opts:
|
||||||
type: none
|
type: none
|
||||||
o: bind
|
o: bind
|
||||||
device: "${PGDATA_PATH:-/mnt/gerbil/pgdata}"
|
device: "${PGDATA_PATH:-/mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata}"
|
||||||
photos:
|
photos:
|
||||||
driver: local
|
driver: local
|
||||||
driver_opts:
|
driver_opts:
|
||||||
type: none
|
type: none
|
||||||
o: bind
|
o: bind
|
||||||
device: "${PHOTOS_PATH:-/mnt/gerbil/photos}"
|
device: "${PHOTOS_PATH:-/mnt/JailStorage/DockerVolumes/gerbilmanager/photos}"
|
||||||
# AR-3: Data Protection key ring — persistiert Gmail-App-Passwort-Verschlüsselung.
|
# AR-3: Data Protection key ring — persistiert Gmail-App-Passwort-Verschlüsselung.
|
||||||
# Muss ein persistentes NAS-Dataset sein (nicht dasselbe wie photos).
|
# Muss ein persistentes NAS-Dataset sein (nicht dasselbe wie photos).
|
||||||
keys:
|
keys:
|
||||||
@@ -133,17 +115,10 @@ volumes:
|
|||||||
driver_opts:
|
driver_opts:
|
||||||
type: none
|
type: none
|
||||||
o: bind
|
o: bind
|
||||||
device: "${KEYS_PATH:-/mnt/gerbil/keys}"
|
device: "${KEYS_PATH:-/mnt/JailStorage/DockerVolumes/gerbilmanager/keys}"
|
||||||
backups:
|
backups:
|
||||||
driver: local
|
driver: local
|
||||||
driver_opts:
|
driver_opts:
|
||||||
type: none
|
type: none
|
||||||
o: bind
|
o: bind
|
||||||
device: "${BACKUPS_PATH:-/mnt/gerbil/backups}"
|
device: "${BACKUPS_PATH:-/mnt/JailStorage/DockerVolumes/gerbilmanager/backups}"
|
||||||
# WEB-2: gemeinsames Volume fuer api (rw) und publicsite-nginx (ro).
|
|
||||||
publicsite:
|
|
||||||
driver: local
|
|
||||||
driver_opts:
|
|
||||||
type: none
|
|
||||||
o: bind
|
|
||||||
device: "${PUBLICSITE_PATH:-/mnt/JailStorage/DockerVolumes/gerbilmanager/publicsite}"
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
# GerbilManager — publicsite nginx (WEB-2)
|
|
||||||
# Serviert die statische oeffentliche Seite aus dem live/-Verzeichnis des Shared Volumes.
|
|
||||||
# SICHERHEIT: Kein Proxy auf die API, kein Zugriff auf den Manager.
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
root /usr/share/nginx/html/live;
|
|
||||||
index index.html;
|
|
||||||
charset utf-8;
|
|
||||||
|
|
||||||
# Alle Seiten: no-cache (Aenderungen sofort sichtbar nach Veroeffentlichen)
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/index.html =404;
|
|
||||||
add_header Cache-Control "no-cache, must-revalidate";
|
|
||||||
add_header X-Content-Type-Options "nosniff";
|
|
||||||
add_header X-Frame-Options "SAMEORIGIN";
|
|
||||||
}
|
|
||||||
|
|
||||||
# CSS/Bilder: kurze TTL (1 Tag)
|
|
||||||
location ~* \.(css|png|jpg|jpeg|gif|ico|webp|svg)$ {
|
|
||||||
try_files $uri =404;
|
|
||||||
expires 1d;
|
|
||||||
add_header Cache-Control "public, max-age=86400";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Kein Zugriff auf Staging-Verzeichnisse
|
|
||||||
location ~ ^/_(staging_new|old)/ {
|
|
||||||
return 403;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
# GerbilManager — Externer nginx-Vhost fuer die oeffentliche Webseite (WEB-2)
|
|
||||||
# In Julians bestehenden nginx-Reverse-Proxy einfuegen.
|
|
||||||
# <DOMAIN> ersetzen sobald der Hostname feststeht (Julian liefert ihn).
|
|
||||||
#
|
|
||||||
# SICHERHEIT: Dieser Vhost zeigt NUR auf den publicsite-Container (Port 8081).
|
|
||||||
# Der Manager (API + Frontend, Port 80) ist NICHT erreichbar von aussen —
|
|
||||||
# er hat keine Authentifizierung und muss LAN-only bleiben.
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
server_name <DOMAIN>;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://127.0.0.1:8081;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
|
|
||||||
# Kein Buffering fuer kleine statische HTML-Seiten
|
|
||||||
proxy_buffering off;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Fuer HTTPS (empfohlen, z.B. per Let's Encrypt via certbot):
|
|
||||||
# server {
|
|
||||||
# listen 443 ssl;
|
|
||||||
# server_name <DOMAIN>;
|
|
||||||
# ssl_certificate /etc/letsencrypt/live/<DOMAIN>/fullchain.pem;
|
|
||||||
# ssl_certificate_key /etc/letsencrypt/live/<DOMAIN>/privkey.pem;
|
|
||||||
# location / {
|
|
||||||
# proxy_pass http://127.0.0.1:8081;
|
|
||||||
# proxy_set_header Host $host;
|
|
||||||
# proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
# proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
# }
|
|
||||||
# }
|
|
||||||
327
docs/ops.md
327
docs/ops.md
@@ -1,4 +1,4 @@
|
|||||||
# GerbilManager — Betriebsanleitung (TrueNAS)
|
# GerbilManager — Betriebsanleitung (TrueNAS SCALE Goldeye)
|
||||||
|
|
||||||
> Zielgruppe: Julian (Systemadministration) und Ehefrau (tägliche Nutzung).
|
> Zielgruppe: Julian (Systemadministration) und Ehefrau (tägliche Nutzung).
|
||||||
> Bookmark für die Ehefrau: **http://\<NAS-IP\>/** (z. B. http://truenas/)
|
> Bookmark für die Ehefrau: **http://\<NAS-IP\>/** (z. B. http://truenas/)
|
||||||
@@ -9,13 +9,12 @@
|
|||||||
|
|
||||||
1. [Übersicht & Architektur](#1-übersicht--architektur)
|
1. [Übersicht & Architektur](#1-übersicht--architektur)
|
||||||
2. [Voraussetzungen](#2-voraussetzungen)
|
2. [Voraussetzungen](#2-voraussetzungen)
|
||||||
3. [Erstinstallation auf TrueNAS](#3-erstinstallation-auf-truenas)
|
3. [Erstinstallation auf TrueNAS Goldeye](#3-erstinstallation-auf-truenas-goldeye)
|
||||||
4. [App starten / stoppen / aktualisieren](#4-app-starten--stoppen--aktualisieren)
|
4. [App starten / stoppen / aktualisieren](#4-app-starten--stoppen--aktualisieren)
|
||||||
5. [Backup & Wiederherstellung](#5-backup--wiederherstellung)
|
5. [Backup & Wiederherstellung](#5-backup--wiederherstellung)
|
||||||
6. [ZFS-Snapshot-Schichtung](#6-zfs-snapshot-schichtung)
|
6. [ZFS-Snapshot-Schichtung](#6-zfs-snapshot-schichtung)
|
||||||
7. [CI/CD via Gitea Actions](#7-cicd-via-gitea-actions)
|
7. [CI/CD via Gitea Actions](#7-cicd-via-gitea-actions)
|
||||||
8. [Offene Fragen (bitte beantworten)](#8-offene-fragen)
|
8. [Fehlerbehebung](#8-fehlerbehebung)
|
||||||
9. [Fehlerbehebung](#9-fehlerbehebung)
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -23,7 +22,7 @@
|
|||||||
|
|
||||||
```
|
```
|
||||||
Browser / Handy
|
Browser / Handy
|
||||||
| HTTP :80
|
| HTTP :80 (oder PORT aus .env, z.B. 8080)
|
||||||
v
|
v
|
||||||
┌──────────────────┐
|
┌──────────────────┐
|
||||||
│ frontend (nginx) │ statisches React-SPA + Reverse-Proxy
|
│ frontend (nginx) │ statisches React-SPA + Reverse-Proxy
|
||||||
@@ -40,9 +39,10 @@ Browser / Handy
|
|||||||
│ db (Postgres 17)│ │ backup (Sidecar) │
|
│ db (Postgres 17)│ │ backup (Sidecar) │
|
||||||
└──────────────────┘ │ pg_dump + tar + cron │
|
└──────────────────┘ │ pg_dump + tar + cron │
|
||||||
│ └──────────────────────┘
|
│ └──────────────────────┘
|
||||||
└─ pgdata-Volume (NAS-Dataset)
|
└─ pgdata-Volume → /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
photos-Volume (NAS-Dataset)
|
photos-Volume → /mnt/JailStorage/DockerVolumes/gerbilmanager/photos
|
||||||
backups-Volume (NAS-Dataset)
|
backups-Volume → /mnt/JailStorage/DockerVolumes/gerbilmanager/backups
|
||||||
|
keys-Volume → /mnt/JailStorage/DockerVolumes/gerbilmanager/keys
|
||||||
```
|
```
|
||||||
|
|
||||||
**Einziger veröffentlichter Port:** `80` (konfigurierbar via `PORT` in `.env`).
|
**Einziger veröffentlichter Port:** `80` (konfigurierbar via `PORT` in `.env`).
|
||||||
@@ -54,68 +54,107 @@ Alles andere läuft intern im Docker-Netz.
|
|||||||
|
|
||||||
| Was | Details |
|
| Was | Details |
|
||||||
|-----|---------|
|
|-----|---------|
|
||||||
| TrueNAS SCALE | Electric Eel 24.10+ (native Docker Custom Apps) |
|
| TrueNAS SCALE | **25.10.2.1 „Goldeye"** (native Docker Custom Apps) |
|
||||||
| Gitea | http://truenas:13000 — Repository `Gulum/GerbilManager` |
|
| Container Registry | `git.rismer.de/gulum` (externes HTTPS) |
|
||||||
| Docker | bereits auf TrueNAS vorhanden (Custom Apps nutzen es) |
|
| Docker | bereits auf TrueNAS Goldeye vorhanden |
|
||||||
| Datasets | Drei ZFS-Datasets anlegen (siehe Schritt 3) |
|
| Verzeichnisse | 4 Ordner unter `/mnt/JailStorage/DockerVolumes/gerbilmanager/` anlegen (Schritt 3.1) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 3. Erstinstallation auf TrueNAS
|
## 3. Erstinstallation auf TrueNAS Goldeye
|
||||||
|
|
||||||
### 3.1 ZFS-Datasets anlegen
|
### 3.1 Verzeichnisse anlegen und Berechtigungen setzen
|
||||||
|
|
||||||
In TrueNAS → **Datasets** → **Dataset hinzufügen** (je einmal wiederholen):
|
Öffne eine Shell auf der NAS (TrueNAS → System → Shell oder SSH):
|
||||||
|
|
||||||
| Dataset-Name | Empfohlener Pfad | Verwendung |
|
|
||||||
|---|---|---|
|
|
||||||
| `gerbil/pgdata` | `/mnt/SSD/gerbil/pgdata` | Postgres-Datenbankdateien |
|
|
||||||
| `gerbil/photos` | `/mnt/SSD/gerbil/photos` | Hochgeladene Tierfotos |
|
|
||||||
| `gerbil/backups` | `/mnt/SSD/gerbil/backups` | Tägliche Backups |
|
|
||||||
|
|
||||||
> **Tipp:** Passe die Pool-Bezeichnung (`SSD`) an deinen tatsächlichen Pool an.
|
|
||||||
|
|
||||||
### 3.2 Repository klonen
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# SSH in TrueNAS oder lokale Shell
|
# Vier Ordner anlegen
|
||||||
git clone http://truenas:13000/Gulum/GerbilManager.git /opt/gerbilmanager
|
mkdir -p /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
|
mkdir -p /mnt/JailStorage/DockerVolumes/gerbilmanager/photos
|
||||||
|
mkdir -p /mnt/JailStorage/DockerVolumes/gerbilmanager/backups
|
||||||
|
mkdir -p /mnt/JailStorage/DockerVolumes/gerbilmanager/keys
|
||||||
|
|
||||||
|
# Postgres-Container läuft als UID 999 (postgres) / GID 999 intern.
|
||||||
|
# pgdata muss von UID 999 beschreibbar sein; postgres erzwingt chmod 0700.
|
||||||
|
chown -R 999:999 /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
|
chmod 700 /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
|
|
||||||
|
# photos, backups und keys werden von der API bzw. dem Sidecar beschrieben
|
||||||
|
# (laufen als root im Container) — keine weiteren ACL-Anpassungen nötig.
|
||||||
|
```
|
||||||
|
|
||||||
|
> **TrueNAS Dataset-ACL-Hinweis:** Falls `JailStorage` ein ZFS-Dataset mit NFSv4-ACLs ist,
|
||||||
|
> und `chown` meldet „Operation not permitted": setze in TrueNAS → Datasets →
|
||||||
|
> `JailStorage` → Berechtigungen → **ACL-Typ: POSIX** (oder nutze das UI-Formular
|
||||||
|
> „Eigentümer: 999, Gruppe: 999" für das `pgdata`-Unterverzeichnis).
|
||||||
|
|
||||||
|
### 3.2 Registry-Login auf der NAS
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker login git.rismer.de
|
||||||
|
# Benutzername und Token/Passwort eingeben (Gitea-Account oder Access Token mit read:packages)
|
||||||
|
```
|
||||||
|
|
||||||
|
Der Login wird unter `/root/.docker/config.json` gespeichert und bleibt nach Reboots erhalten.
|
||||||
|
|
||||||
|
### 3.3 Repository klonen
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://git.rismer.de/gulum/GerbilManager.git /opt/gerbilmanager
|
||||||
cd /opt/gerbilmanager
|
cd /opt/gerbilmanager
|
||||||
```
|
```
|
||||||
|
|
||||||
### 3.3 Konfiguration anlegen
|
### 3.4 Konfiguration anlegen
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cp deploy/truenas/.env.example deploy/truenas/.env
|
cp deploy/truenas/.env.example deploy/truenas/.env
|
||||||
# Jetzt .env bearbeiten:
|
|
||||||
nano deploy/truenas/.env
|
nano deploy/truenas/.env
|
||||||
```
|
```
|
||||||
|
|
||||||
Mindestens setzen:
|
Mindestens setzen:
|
||||||
- `POSTGRES_PASSWORD` — sicheres Passwort (mind. 20 Zeichen)
|
|
||||||
- `PGDATA_PATH`, `PHOTOS_PATH`, `BACKUPS_PATH` — tatsächliche Dataset-Pfade
|
|
||||||
|
|
||||||
### 3.4 Images bauen und App starten
|
| Variable | Wert |
|
||||||
|
|----------|------|
|
||||||
|
| `POSTGRES_PASSWORD` | Sicheres Passwort (mind. 20 Zeichen, keine `"`) |
|
||||||
|
| `AI__BaseUrl` | Gemini: `https://generativelanguage.googleapis.com/v1beta/openai` |
|
||||||
|
| `AI__ApiKey` | Dein Gemini API-Key |
|
||||||
|
| `AI__Model` | `gemini-2.0-flash` (oder `gemini-flash-latest`) |
|
||||||
|
| `PORT` | `80` — falls Port 80 auf der NAS bereits belegt ist: **auf `8080` ändern** |
|
||||||
|
|
||||||
|
Die Pfad-Variablen (`PGDATA_PATH`, `PHOTOS_PATH`, etc.) sind bereits auf die Goldeye-Standardpfade
|
||||||
|
vorbelegt und müssen nur geändert werden, wenn du einen anderen Pool nutzt.
|
||||||
|
|
||||||
|
### 3.5 Images ziehen und App starten
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd /opt/gerbilmanager
|
cd /opt/gerbilmanager
|
||||||
docker compose -f deploy/truenas/compose.yaml build
|
docker compose -f deploy/truenas/compose.yaml pull
|
||||||
docker compose -f deploy/truenas/compose.yaml up -d
|
docker compose -f deploy/truenas/compose.yaml up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
Erster Start dauert ca. 2–3 Minuten (Postgres-Init + EF-Migrationen).
|
Erster Start dauert ca. 2–3 Minuten (Postgres-Init + EF-Migrationen).
|
||||||
|
|
||||||
### 3.5 Prüfen
|
> **TrueNAS Goldeye Custom App (Alternative):**
|
||||||
|
> Statt der Shell kann die App auch über TrueNAS → Apps → „Custom App installieren" →
|
||||||
|
> „Install via YAML" deployt werden: compose-Inhalt einfügen, Volumes als Host-Pfade
|
||||||
|
> konfigurieren. Die Shell-Methode ist einfacher und gibt mehr Kontrolle.
|
||||||
|
|
||||||
|
### 3.6 Verifikation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Alle Container laufen?
|
# Alle 4 Container laufen?
|
||||||
docker compose -f deploy/truenas/compose.yaml ps
|
docker compose -f deploy/truenas/compose.yaml ps
|
||||||
|
|
||||||
# API-Healthcheck
|
# API-Healthcheck (erwartet: {"status":"Healthy"})
|
||||||
curl http://localhost/api/health
|
curl -s http://localhost/api/health
|
||||||
|
|
||||||
# Webapp im Browser
|
# Tier-Gesamtanzahl prüfen (erwartet > 0 nach Import)
|
||||||
http://<NAS-IP>/
|
curl -s "http://localhost/api/gerbils?pageSize=1" | grep -o '"totalCount":[0-9]*'
|
||||||
|
|
||||||
|
# API-Doku (Scalar) im Browser
|
||||||
|
http://<NAS-IP>/scalar
|
||||||
|
|
||||||
|
# Foto-Upload: in der Webapp ein Tier öffnen → Foto hochladen → Foto erscheint
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -125,6 +164,7 @@ http://<NAS-IP>/
|
|||||||
### Starten
|
### Starten
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
cd /opt/gerbilmanager
|
||||||
docker compose -f deploy/truenas/compose.yaml up -d
|
docker compose -f deploy/truenas/compose.yaml up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -134,26 +174,17 @@ docker compose -f deploy/truenas/compose.yaml up -d
|
|||||||
docker compose -f deploy/truenas/compose.yaml down
|
docker compose -f deploy/truenas/compose.yaml down
|
||||||
```
|
```
|
||||||
|
|
||||||
### Aktualisieren (nach `git push` auf main)
|
### Aktualisieren (nach CI-Push auf main)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd /opt/gerbilmanager
|
cd /opt/gerbilmanager
|
||||||
git pull
|
git pull
|
||||||
docker compose -f deploy/truenas/compose.yaml build
|
docker compose -f deploy/truenas/compose.yaml pull
|
||||||
docker compose -f deploy/truenas/compose.yaml up -d
|
docker compose -f deploy/truenas/compose.yaml up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
> EF-Migrationen laufen automatisch beim API-Start — kein manueller Schritt nötig.
|
> EF-Migrationen laufen automatisch beim API-Start — kein manueller Schritt nötig.
|
||||||
|
|
||||||
### Mit Gitea CI (wenn Actions aktiviert)
|
|
||||||
|
|
||||||
Push auf `main` triggert automatisch Build → Test → Image-Push.
|
|
||||||
Danach auf der NAS:
|
|
||||||
```bash
|
|
||||||
docker compose -f deploy/truenas/compose.yaml pull
|
|
||||||
docker compose -f deploy/truenas/compose.yaml up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 5. Backup & Wiederherstellung
|
## 5. Backup & Wiederherstellung
|
||||||
@@ -165,12 +196,12 @@ Der `backup`-Sidecar-Container läuft dauerhaft und sichert täglich um **03:00
|
|||||||
- Komprimiertes Foto-Archiv als `.tar.gz`
|
- Komprimiertes Foto-Archiv als `.tar.gz`
|
||||||
- Rotation: Backups älter als `BACKUP_KEEP_DAYS` (Standard: 7) werden gelöscht
|
- Rotation: Backups älter als `BACKUP_KEEP_DAYS` (Standard: 7) werden gelöscht
|
||||||
|
|
||||||
Backups liegen unter: `${BACKUPS_PATH}/YYYY-MM-DD_HH-MM/`
|
Backups liegen unter: `/mnt/JailStorage/DockerVolumes/gerbilmanager/backups/YYYY-MM-DD_HH-MM/`
|
||||||
|
|
||||||
```
|
```
|
||||||
/mnt/SSD/gerbil/backups/
|
/mnt/JailStorage/DockerVolumes/gerbilmanager/backups/
|
||||||
2026-06-06_03-00/
|
2026-06-06_03-00/
|
||||||
gerbilmanager_2026-06-06_03-00.sql (Datenbank)
|
gerbilmanager_2026-06-06_03-00.sql (Datenbank-Dump, Klartext SQL)
|
||||||
photos_2026-06-06_03-00.tar.gz (Fotos)
|
photos_2026-06-06_03-00.tar.gz (Fotos)
|
||||||
backup.log (Protokoll)
|
backup.log (Protokoll)
|
||||||
```
|
```
|
||||||
@@ -184,52 +215,68 @@ docker compose -f deploy/truenas/compose.yaml exec backup /bin/sh /scripts/backu
|
|||||||
### Backup-Log prüfen
|
### Backup-Log prüfen
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
tail -50 /mnt/SSD/gerbil/backups/backup.log
|
tail -50 /mnt/JailStorage/DockerVolumes/gerbilmanager/backups/backup.log
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Backup-Validierung: Das Skript prüft ob der Dump `CREATE TABLE` enthält — fehlt dieser
|
||||||
|
Marker, erscheint eine WARNUNG im Log. Größe 0 KB bedeutet Fehlschlag.
|
||||||
|
|
||||||
### Wiederherstellung — Runbook
|
### Wiederherstellung — Runbook
|
||||||
|
|
||||||
> **WARNUNG:** Alle aktuellen Daten werden überschrieben!
|
> **WARNUNG:** Alle aktuellen Datenbankdaten und Fotos werden überschrieben!
|
||||||
|
|
||||||
**Schritt 1:** App stoppen (optional, aber empfohlen)
|
**Schritt 1:** API und Frontend stoppen (DB und backup-Sidecar laufen weiter)
|
||||||
```bash
|
```bash
|
||||||
docker compose -f deploy/truenas/compose.yaml stop api frontend
|
docker compose -f deploy/truenas/compose.yaml stop api frontend
|
||||||
```
|
```
|
||||||
|
|
||||||
**Schritt 2:** Restore ausführen
|
**Schritt 2:** Restore ausführen
|
||||||
```bash
|
|
||||||
# Neuestes Backup wiederherstellen:
|
|
||||||
docker compose -f deploy/truenas/compose.yaml exec backup \
|
|
||||||
/bin/sh /scripts/restore.sh
|
|
||||||
|
|
||||||
# Bestimmtes Backup wiederherstellen:
|
```bash
|
||||||
docker compose -f deploy/truenas/compose.yaml exec backup \
|
# Neuestes Backup automatisch wählen und bestätigen:
|
||||||
/bin/sh /scripts/restore.sh 2026-06-05_03-00
|
docker compose -f deploy/truenas/compose.yaml exec -T backup \
|
||||||
|
/bin/sh /scripts/restore.sh latest -f
|
||||||
|
|
||||||
|
# Bestimmtes Backup (Datum aus Verzeichnisname):
|
||||||
|
docker compose -f deploy/truenas/compose.yaml exec -T backup \
|
||||||
|
/bin/sh /scripts/restore.sh 2026-06-06_03-00 -f
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Das Skript:
|
||||||
|
1. Trennt alle offenen DB-Verbindungen
|
||||||
|
2. Spielt den SQL-Dump mit `psql -h db -U postgres -d gerbilmanager < dump.sql` ein
|
||||||
|
3. Entpackt das Foto-Archiv nach `/data/photos`
|
||||||
|
|
||||||
**Schritt 3:** API neu starten
|
**Schritt 3:** API neu starten
|
||||||
```bash
|
```bash
|
||||||
docker compose -f deploy/truenas/compose.yaml start api frontend
|
docker compose -f deploy/truenas/compose.yaml start api frontend
|
||||||
```
|
```
|
||||||
|
|
||||||
**Schritt 4:** Prüfen
|
**Schritt 4 — Verifikation (Pflicht nach erstem Restore-Drill):**
|
||||||
```bash
|
```bash
|
||||||
curl http://localhost/api/color-varieties | grep -c '"id"'
|
# Tier-Anzahl prüfen
|
||||||
# Erwarteter Wert: 73
|
curl -s "http://localhost/api/gerbils?pageSize=1" | grep -o '"totalCount":[0-9]*'
|
||||||
|
|
||||||
|
# ColorVariety-Anzahl (Stammdaten, erwartet: >= 60)
|
||||||
|
curl -s http://localhost/api/color-varieties | python3 -c "import sys,json; print(len(json.load(sys.stdin)))"
|
||||||
|
|
||||||
|
# Foto stichprobenartig prüfen
|
||||||
|
ls /mnt/JailStorage/DockerVolumes/gerbilmanager/photos/ | head -5
|
||||||
```
|
```
|
||||||
|
|
||||||
### Restore-Nachweis (Round-Trip-Test)
|
### Restore-Nachweis (Round-Trip-Test, lokal 2026-06-06)
|
||||||
|
|
||||||
Protokoll vom Test auf lokalem Aspire-Postgres (Vorgänger-Instanz, 2026-06-06 07:09):
|
Protokoll vom getesteten Restore auf lokalem Aspire-Postgres:
|
||||||
```
|
```
|
||||||
73 ColorVarieties vorhanden
|
73 ColorVarieties vorhanden
|
||||||
→ DELETE 12 Zeilen → 61 verbleibend
|
→ DELETE 12 Zeilen → 61 verbleibend
|
||||||
→ pg_restore eingespielt
|
→ psql < dump.sql eingespielt
|
||||||
→ 73 ColorVarieties bestätigt
|
→ 73 ColorVarieties bestätigt
|
||||||
Exit-Code: 0
|
Exit-Code: 0
|
||||||
```
|
```
|
||||||
Die Container-Restore-Skripte nutzen dieselbe `psql < dump.sql` Logik.
|
|
||||||
**Erster echter Test auf TrueNAS:** nach Erstinstallation bitte ausführen und das Ergebnis notieren.
|
**Erster TrueNAS-Restore-Drill:** nach Erstinstallation bitte ausführen und Tier-Anzahl
|
||||||
|
notieren — beweist dass Backup + Restore auf dem NAS korrekt funktionieren.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -240,15 +287,15 @@ Sie schützen vor versehentlichem Datenverlust auf Dataset-Ebene.
|
|||||||
|
|
||||||
### Empfohlene Snapshot-Konfiguration
|
### Empfohlene Snapshot-Konfiguration
|
||||||
|
|
||||||
In TrueNAS → **Datasets** → Dataset auswählen → **Snapshots** → **Regelmäßige Snapshots**:
|
In TrueNAS → **Datasets** → `JailStorage/DockerVolumes/gerbilmanager` → **Snapshots** → **Regelmäßige Snapshots**:
|
||||||
|
|
||||||
| Dataset | Häufigkeit | Aufbewahrung |
|
| Unterordner | Häufigkeit | Aufbewahrung |
|
||||||
|---------|-----------|--------------|
|
|-------------|-----------|--------------|
|
||||||
| `gerbil/photos` | Stündlich | 24 Stunden |
|
| `.../photos` | Stündlich | 24 Stunden |
|
||||||
| `gerbil/photos` | Täglich | 30 Tage |
|
| `.../photos` | Täglich | 30 Tage |
|
||||||
| `gerbil/pgdata` | Stündlich | 24 Stunden |
|
| `.../pgdata` | Stündlich | 24 Stunden |
|
||||||
| `gerbil/pgdata` | Täglich | 30 Tage |
|
| `.../pgdata` | Täglich | 30 Tage |
|
||||||
| `gerbil/backups` | Täglich | 90 Tage |
|
| `.../backups` | Täglich | 90 Tage |
|
||||||
|
|
||||||
> **Hinweis:** `pgdata` enthält Live-Postgres-Dateien. ZFS-Snapshots davon sind crash-konsistent,
|
> **Hinweis:** `pgdata` enthält Live-Postgres-Dateien. ZFS-Snapshots davon sind crash-konsistent,
|
||||||
> aber **nicht** application-konsistent — für einen sauberen DB-Restore immer den `pg_dump` verwenden,
|
> aber **nicht** application-konsistent — für einen sauberen DB-Restore immer den `pg_dump` verwenden,
|
||||||
@@ -257,94 +304,93 @@ In TrueNAS → **Datasets** → Dataset auswählen → **Snapshots** → **Regel
|
|||||||
### Snapshot manuell erstellen (z. B. vor Update)
|
### Snapshot manuell erstellen (z. B. vor Update)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# TrueNAS CLI
|
# Pool-/Dataset-Name anpassen falls nötig
|
||||||
zfs snapshot SSD/gerbil/photos@vor-update-$(date +%Y%m%d)
|
zfs snapshot JailStorage/DockerVolumes/gerbilmanager/photos@vor-update-$(date +%Y%m%d)
|
||||||
zfs snapshot SSD/gerbil/backups@vor-update-$(date +%Y%m%d)
|
zfs snapshot JailStorage/DockerVolumes/gerbilmanager/backups@vor-update-$(date +%Y%m%d)
|
||||||
```
|
```
|
||||||
|
|
||||||
### Aus ZFS-Snapshot wiederherstellen (Fotos)
|
### Aus ZFS-Snapshot wiederherstellen (Fotos)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Snapshot auflisten
|
# Snapshots auflisten
|
||||||
zfs list -t snapshot SSD/gerbil/photos
|
zfs list -t snapshot JailStorage/DockerVolumes/gerbilmanager/photos
|
||||||
|
|
||||||
# Datei aus Snapshot kopieren
|
# Einzelne Datei aus Snapshot kopieren
|
||||||
cp /mnt/SSD/gerbil/photos/.zfs/snapshot/<NAME>/datei.jpg /mnt/SSD/gerbil/photos/
|
cp /mnt/JailStorage/DockerVolumes/gerbilmanager/photos/.zfs/snapshot/<NAME>/datei.jpg \
|
||||||
|
/mnt/JailStorage/DockerVolumes/gerbilmanager/photos/
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 7. CI/CD via Gitea Actions
|
## 7. CI/CD via Gitea Actions
|
||||||
|
|
||||||
Der Workflow `.gitea/workflows/ci.yml` ist als **Entwurf vorhanden, aber inaktiv**.
|
CI pusht Images nach Erfolg zu `git.rismer.de/gulum/gerbilmanager-api` und
|
||||||
|
`git.rismer.de/gulum/gerbilmanager-frontend`.
|
||||||
|
|
||||||
### Aktivierung
|
### Registry-Secrets in Gitea
|
||||||
|
|
||||||
1. **Gitea Actions aktivieren:**
|
Gitea → Repository → Einstellungen → Secrets:
|
||||||
Gitea → Repository `GerbilManager` → Einstellungen → Actions → "Actions aktivieren"
|
|
||||||
|
|
||||||
2. **Gitea Actions Runner installieren** (auf TrueNAS oder einem separaten Gerät):
|
| Secret | Wert |
|
||||||
```bash
|
|--------|------|
|
||||||
# Gitea Runner Container (einfachste Variante für TrueNAS)
|
| `REGISTRY_USER` | Gitea-Benutzername |
|
||||||
docker run -d --name gitea-runner \
|
| `REGISTRY_TOKEN` | Gitea Access Token mit `package:write` |
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
|
||||||
-v /opt/gitea-runner:/data \
|
|
||||||
-e GITEA_INSTANCE_URL=http://truenas:13000 \
|
|
||||||
-e GITEA_RUNNER_REGISTRATION_TOKEN=<TOKEN> \
|
|
||||||
gitea/act_runner:latest
|
|
||||||
```
|
|
||||||
Token: Gitea → Admin → Actions → Runner → "Runner hinzufügen"
|
|
||||||
|
|
||||||
3. **Registry-Secrets konfigurieren:**
|
### Update nach CI-Push
|
||||||
Gitea → Repository → Einstellungen → Secrets:
|
|
||||||
- `REGISTRY_USER` — dein Gitea-Benutzername
|
|
||||||
- `REGISTRY_TOKEN` — Gitea Access Token mit `package:write`-Berechtigung
|
|
||||||
|
|
||||||
### Workflow nach Aktivierung
|
```bash
|
||||||
|
# Auf der NAS nach erfolgreichem CI-Lauf:
|
||||||
```
|
cd /opt/gerbilmanager
|
||||||
git push origin main
|
git pull
|
||||||
→ Gitea Actions: dotnet test + npm test + npm run build
|
docker compose -f deploy/truenas/compose.yaml pull
|
||||||
→ Bei Erfolg: docker build + push zu truenas:13000/gulum/
|
docker compose -f deploy/truenas/compose.yaml up -d
|
||||||
→ Auf NAS: docker compose pull + up -d
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 8. Offene Fragen
|
## 8. Fehlerbehebung
|
||||||
|
|
||||||
Bitte beantworte diese Fragen, damit das Setup fertiggestellt werden kann:
|
|
||||||
|
|
||||||
| # | Frage | Auswirkung |
|
|
||||||
|---|-------|-----------|
|
|
||||||
| 1 | **TrueNAS SCALE Version?** Electric Eel 24.10 hat native Docker Custom Apps. Ältere Versionen nutzen Kubernetes. | Bestimmt ob `docker compose` direkt läuft |
|
|
||||||
| 2 | **Gitea Actions verfügbar/aktivierbar?** | CI/CD-Workflow aktiv oder nur manuell deployen |
|
|
||||||
| 3 | **Eigener Postgres-Container (empfohlen) oder vorhandene NAS-Postgres-App?** | Isolation vs. geteilte Instanz |
|
|
||||||
| 4 | **Genaue Dataset-Pfade?** Poolname und Pfad-Präfix | `.env`-Konfiguration |
|
|
||||||
| 5 | **Port-Wahl?** Standard 80 — frei auf der NAS? | `PORT`-Wert in `.env` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. Fehlerbehebung
|
|
||||||
|
|
||||||
### App startet nicht
|
### App startet nicht
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Logs aller Container
|
|
||||||
docker compose -f deploy/truenas/compose.yaml logs
|
docker compose -f deploy/truenas/compose.yaml logs
|
||||||
|
|
||||||
# Logs eines bestimmten Containers
|
|
||||||
docker compose -f deploy/truenas/compose.yaml logs api
|
docker compose -f deploy/truenas/compose.yaml logs api
|
||||||
docker compose -f deploy/truenas/compose.yaml logs db
|
docker compose -f deploy/truenas/compose.yaml logs db
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Port 80 belegt
|
||||||
|
|
||||||
|
Falls Port 80 vom TrueNAS-System selbst genutzt wird:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# In deploy/truenas/.env:
|
||||||
|
PORT=8080
|
||||||
|
# Dann neu starten:
|
||||||
|
docker compose -f deploy/truenas/compose.yaml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### Postgres startet nicht (Permission denied auf pgdata)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# UID 999 muss Eigentümer des pgdata-Verzeichnisses sein:
|
||||||
|
chown -R 999:999 /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
|
chmod 700 /mnt/JailStorage/DockerVolumes/gerbilmanager/pgdata
|
||||||
|
docker compose -f deploy/truenas/compose.yaml restart db
|
||||||
|
```
|
||||||
|
|
||||||
|
### Registry-Pull schlägt fehl
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Neu einloggen:
|
||||||
|
docker login git.rismer.de
|
||||||
|
# Dann pull wiederholen:
|
||||||
|
docker compose -f deploy/truenas/compose.yaml pull
|
||||||
|
```
|
||||||
|
|
||||||
### Datenbank nicht erreichbar
|
### Datenbank nicht erreichbar
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# DB-Container läuft?
|
|
||||||
docker compose -f deploy/truenas/compose.yaml ps db
|
docker compose -f deploy/truenas/compose.yaml ps db
|
||||||
|
|
||||||
# Verbindung testen
|
|
||||||
docker compose -f deploy/truenas/compose.yaml exec db \
|
docker compose -f deploy/truenas/compose.yaml exec db \
|
||||||
psql -U postgres -d gerbilmanager -c "\dt"
|
psql -U postgres -d gerbilmanager -c "\dt"
|
||||||
```
|
```
|
||||||
@@ -352,27 +398,16 @@ docker compose -f deploy/truenas/compose.yaml exec db \
|
|||||||
### Backup-Fehler
|
### Backup-Fehler
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Backup-Log prüfen
|
tail -50 /mnt/JailStorage/DockerVolumes/gerbilmanager/backups/backup.log
|
||||||
cat /mnt/SSD/gerbil/backups/backup.log | tail -30
|
docker compose -f deploy/truenas/compose.yaml exec backup /bin/sh /scripts/backup.sh
|
||||||
|
|
||||||
# Backup manuell starten (mit Fehlerausgabe)
|
|
||||||
docker compose -f deploy/truenas/compose.yaml exec backup \
|
|
||||||
/bin/sh /scripts/backup.sh
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Fotos werden nicht angezeigt
|
### Fotos werden nicht angezeigt
|
||||||
|
|
||||||
Prüfe ob das `photos`-Volume korrekt gemounted ist:
|
|
||||||
```bash
|
```bash
|
||||||
docker compose -f deploy/truenas/compose.yaml exec api ls /data/photos
|
docker compose -f deploy/truenas/compose.yaml exec api ls /data/photos
|
||||||
```
|
```
|
||||||
|
|
||||||
### Container-Status zurücksetzen (Neustart)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose -f deploy/truenas/compose.yaml restart api
|
|
||||||
```
|
|
||||||
|
|
||||||
### Kompletter Neustart (Daten bleiben erhalten)
|
### Kompletter Neustart (Daten bleiben erhalten)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -1,136 +0,0 @@
|
|||||||
# GerbilManager — Oeffentliche Webseite (Self-Hosted, TrueNAS)
|
|
||||||
|
|
||||||
> **Zielgruppe:** Julian.
|
|
||||||
> Die oeffentliche Seite (Jimdo-Ersatz) laeuft self-hosted auf der TrueNAS neben dem Manager.
|
|
||||||
> Strato-Domain → DynDNS → IP → Julians nginx-Proxy → publicsite-Container (Port 8081).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Architektur
|
|
||||||
|
|
||||||
```
|
|
||||||
Internet
|
|
||||||
| HTTPS/HTTP
|
|
||||||
v
|
|
||||||
Julians nginx-Reverse-Proxy (laeuft schon auf NAS)
|
|
||||||
| proxy_pass http://127.0.0.1:8081
|
|
||||||
v
|
|
||||||
publicsite (nginx:alpine, Port 8081) ← liest nur: /usr/share/nginx/html/live/
|
|
||||||
| (Shared Volume, read-only)
|
|
||||||
| [POST /api/publish im Manager schreibt in dasselbe Volume]
|
|
||||||
v
|
|
||||||
api (.NET, Port 8080 intern) → schreibt: /data/publicsite/live/
|
|
||||||
| (Shared Volume, read-write)
|
|
||||||
v
|
|
||||||
Manager (frontend-nginx, Port 80) ← LAN-only, NIE internet-exponiert
|
|
||||||
```
|
|
||||||
|
|
||||||
**SICHERHEIT — harte Bedingung:**
|
|
||||||
- Nur `publicsite` (Port 8081) wird ins Internet weitergeleitet.
|
|
||||||
- Der Manager (API + Frontend, Port 80) hat KEINE Authentifizierung → LAN-only.
|
|
||||||
- Der `publicsite`-nginx proxied NICHT auf die API — er serviert nur statisches HTML.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Erstinstallation
|
|
||||||
|
|
||||||
### 1. Verzeichnis anlegen
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkdir -p /mnt/JailStorage/DockerVolumes/gerbilmanager/publicsite
|
|
||||||
```
|
|
||||||
|
|
||||||
Das Verzeichnis wird von der API beschrieben (laeuft als root im Container) — keine ACL-Aenderung noetig.
|
|
||||||
Beim ersten `POST /api/publish` legt die API automatisch `live/` und `_staging_new/` darunter an.
|
|
||||||
|
|
||||||
### 2. .env erganzen
|
|
||||||
|
|
||||||
In `deploy/truenas/.env` hinzufuegen (oder aus `.env.example` uebernehmen):
|
|
||||||
|
|
||||||
```env
|
|
||||||
PUBLICSITE_PATH=/mnt/JailStorage/DockerVolumes/gerbilmanager/publicsite
|
|
||||||
PUBLICSITE_PORT=8081
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Compose-Stack neu starten
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd /opt/gerbilmanager
|
|
||||||
docker compose -f deploy/truenas/compose.yaml up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
Der neue `publicsite`-Container startet und serviert Port 8081.
|
|
||||||
Solange noch nicht veroeffentlicht wurde, zeigt er einen 404 (live/-Verzeichnis leer).
|
|
||||||
|
|
||||||
### 4. Julians externen nginx konfigurieren
|
|
||||||
|
|
||||||
Inhalt von `deploy/truenas/vhost-snippet.conf` in den bestehenden nginx-Proxy einfuegen
|
|
||||||
(als eigenen `server`-Block oder per `include`):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Auf der NAS, nginx-Konfigverzeichnis (z.B. /etc/nginx/conf.d/ oder sites-available):
|
|
||||||
nano /etc/nginx/conf.d/gerbilmanager-public.conf
|
|
||||||
# <DOMAIN> durch den tatsaechlichen Hostnamen ersetzen
|
|
||||||
nginx -t && nginx -s reload
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Seite veroeffentlichen (Publish-Ablauf)
|
|
||||||
|
|
||||||
1. Im Manager einloggen (http://\<NAS-IP\>/)
|
|
||||||
2. Navigiere zu **Webseite** → Inhalte bearbeiten → **Veroeffentlichen**
|
|
||||||
3. Klick auf "Veroeffentlichen" loest `POST /api/publish` aus.
|
|
||||||
|
|
||||||
**Was passiert intern:**
|
|
||||||
```
|
|
||||||
POST /api/publish
|
|
||||||
→ API baut SiteSnapshot aus DB (alle Published-Seiten)
|
|
||||||
→ SiteRenderer rendert Snapshot → HTML-Dateien (path → content Map)
|
|
||||||
→ Schreibt Dateien nach /data/publicsite/_staging_new/
|
|
||||||
→ Atomic Swap: _staging_new/ → live/ (rename = ein Syscall, nie halb-geschrieben)
|
|
||||||
→ publicsite-nginx serviert beim naechsten Request sofort den neuen Stand
|
|
||||||
→ Kein Container-Restart, kein Image-Rebuild, kein CI
|
|
||||||
Response: { "filesPublished": N }
|
|
||||||
```
|
|
||||||
|
|
||||||
**Endergebnis:** publicsite-nginx liest sofort den neuen Stand aus `live/`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Verifikation
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# publicsite-Container laeuft?
|
|
||||||
docker compose -f deploy/truenas/compose.yaml ps publicsite
|
|
||||||
|
|
||||||
# Seite lokal abrufbar?
|
|
||||||
curl -s http://localhost:8081/ | head -5
|
|
||||||
|
|
||||||
# live/-Verzeichnis gefuellt?
|
|
||||||
ls /mnt/JailStorage/DockerVolumes/gerbilmanager/publicsite/live/
|
|
||||||
|
|
||||||
# Oeffentlich erreichbar (nach DNS-Propagation)?
|
|
||||||
curl -s http://<DOMAIN>/ | grep "Kleine Chaoten"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Sicherheitstrennung (Pflichtcheck)
|
|
||||||
|
|
||||||
| Was | Port | Internet-exponiert? |
|
|
||||||
|-----|------|---------------------|
|
|
||||||
| Manager (api + frontend) | 80 | **NEIN** — LAN-only |
|
|
||||||
| Oeffentliche Seite (publicsite) | 8081 | Ja, via Julians nginx-Proxy |
|
|
||||||
| API-Doku (Scalar) | 80/scalar | **NEIN** — LAN-only |
|
|
||||||
|
|
||||||
Der Manager-nginx (gerbilmanager-frontend, Port 80) und die API (Port 8080 intern)
|
|
||||||
sind NICHT in `vhost-snippet.conf` eingetragen und NICHT in Julians externem Proxy konfiguriert.
|
|
||||||
Sie sind ausschliesslich im Heimnetz erreichbar.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Hostname noch ausstehend
|
|
||||||
|
|
||||||
`<DOMAIN>` in `deploy/truenas/vhost-snippet.conf` ist ein Platzhalter.
|
|
||||||
Julian nennt den Hostnamen/Subdomain → ersetzen und nginx neu laden.
|
|
||||||
@@ -110,30 +110,3 @@ test('＋-Knopf ist sichtbar und lädt weitere Vorfahren nach (STAMMBAUM-EXPAND)
|
|||||||
await expandBtn.click({ force: true })
|
await expandBtn.click({ force: true })
|
||||||
await expect(page.getByRole('link', { name: 'Max' })).toBeVisible({ timeout: 8000 })
|
await expect(page.getByRole('link', { name: 'Max' })).toBeVisible({ timeout: 8000 })
|
||||||
})
|
})
|
||||||
|
|
||||||
test('Würfe-Panel zeigt Würfe des Wurzeltiers + Link öffnet Wurf (STAMMBAUM-LITTERS)', async ({ page }) => {
|
|
||||||
skipUnlessMock()
|
|
||||||
// Fridolin ist Vater von Wurf K (5 Junge) — Panel muss erscheinen.
|
|
||||||
await page.goto('/rennmaeuse/fridolin/stammbaum')
|
|
||||||
await expect(page.locator('.pedigree-card').first()).toBeVisible()
|
|
||||||
|
|
||||||
const panel = page.locator('.stammbaum-litters-panel')
|
|
||||||
await expect(panel).toBeVisible()
|
|
||||||
await expect(panel).toContainText(t.littersTitle)
|
|
||||||
await expect(panel).toContainText('Wurf K')
|
|
||||||
await expect(panel).toContainText('5')
|
|
||||||
|
|
||||||
// Link-Klick → Wurf-Detailseite
|
|
||||||
const wurfLink = panel.getByRole('link', { name: /Wurf K/ })
|
|
||||||
await expect(wurfLink).toBeVisible()
|
|
||||||
await wurfLink.click()
|
|
||||||
await expect(page).toHaveURL(/\/wuerfe\/w-kruemel/)
|
|
||||||
})
|
|
||||||
|
|
||||||
test('Kein Würfe-Panel wenn Wurzeltier keine Würfe hat (STAMMBAUM-LITTERS)', async ({ page }) => {
|
|
||||||
skipUnlessMock()
|
|
||||||
// Krümel hat noch keine Würfe als Elternteil → Panel muss fehlen.
|
|
||||||
await page.goto('/rennmaeuse/kruemel/stammbaum')
|
|
||||||
await expect(page.locator('.pedigree-card').first()).toBeVisible()
|
|
||||||
await expect(page.locator('.stammbaum-litters-panel')).not.toBeVisible()
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -62,12 +62,7 @@ describe('NAMEGEN_USAGES', () => {
|
|||||||
expect(codes).toContain('mythg')
|
expect(codes).toContain('mythg')
|
||||||
expect(codes).toContain('ger')
|
expect(codes).toContain('ger')
|
||||||
expect(codes).toContain('arb')
|
expect(codes).toContain('arb')
|
||||||
expect(codes).toContain('disney')
|
expect(codes).toHaveLength(5)
|
||||||
expect(codes).toContain('pokemon')
|
|
||||||
expect(codes).toContain('encities')
|
|
||||||
expect(codes).toContain('hrcities')
|
|
||||||
expect(codes).toContain('usstates')
|
|
||||||
expect(codes).toHaveLength(10)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('every usage has a non-empty label', () => {
|
it('every usage has a non-empty label', () => {
|
||||||
|
|||||||
@@ -13,11 +13,6 @@ export const NAMEGEN_USAGES = [
|
|||||||
{ code: 'mythg', label: 'Griech. Mythologie' },
|
{ code: 'mythg', label: 'Griech. Mythologie' },
|
||||||
{ code: 'ger', label: 'Deutsch' },
|
{ code: 'ger', label: 'Deutsch' },
|
||||||
{ code: 'arb', label: 'Arabisch' },
|
{ code: 'arb', label: 'Arabisch' },
|
||||||
{ code: 'disney', label: 'Disney' },
|
|
||||||
{ code: 'pokemon', label: 'Pokémon' },
|
|
||||||
{ code: 'encities', label: 'Englische Städte' },
|
|
||||||
{ code: 'hrcities', label: 'Kroatische Städte' },
|
|
||||||
{ code: 'usstates', label: 'US-Bundesstaaten' },
|
|
||||||
] as const
|
] as const
|
||||||
|
|
||||||
export type NamegenUsageCode = (typeof NAMEGEN_USAGES)[number]['code']
|
export type NamegenUsageCode = (typeof NAMEGEN_USAGES)[number]['code']
|
||||||
|
|||||||
@@ -22,10 +22,9 @@ import Tree from 'react-d3-tree'
|
|||||||
import type { CustomNodeElementProps, Point, RawNodeDatum } from 'react-d3-tree'
|
import type { CustomNodeElementProps, Point, RawNodeDatum } from 'react-d3-tree'
|
||||||
import { de } from '../strings/de'
|
import { de } from '../strings/de'
|
||||||
import { ApiError } from '../api/client'
|
import { ApiError } from '../api/client'
|
||||||
import { listLitters } from '../api/litters'
|
|
||||||
import { listColorVarieties } from '../api/lookups'
|
import { listColorVarieties } from '../api/lookups'
|
||||||
import { getInbreedingCoefficient } from '../api/pedigree'
|
import { getInbreedingCoefficient } from '../api/pedigree'
|
||||||
import type { Gender, Gerbil, Litter } from '../api/types'
|
import type { Gender, Gerbil } from '../api/types'
|
||||||
import { useApi } from '../hooks/useApi'
|
import { useApi } from '../hooks/useApi'
|
||||||
import { formatDate, genderLabel } from '../format/labels'
|
import { formatDate, genderLabel } from '../format/labels'
|
||||||
import { UNKNOWN_FARBSCHLAG, fromDisplayString, genotypeToFarbschlag, toDisplayString } from '../genetics'
|
import { UNKNOWN_FARBSCHLAG, fromDisplayString, genotypeToFarbschlag, toDisplayString } from '../genetics'
|
||||||
@@ -157,13 +156,6 @@ export default function StammbaumPage() {
|
|||||||
? `${(inbreeding.data * 100).toLocaleString('de-DE', { maximumFractionDigits: 1 })} %`
|
? `${(inbreeding.data * 100).toLocaleString('de-DE', { maximumFractionDigits: 1 })} %`
|
||||||
: t.inbreeding.unavailable
|
: t.inbreeding.unavailable
|
||||||
|
|
||||||
/* ── Würfe des Wurzeltiers (STAMMBAUM-LITTERS): aktualisiert bei Umwurzeln ── */
|
|
||||||
const rootLitters = useApi(
|
|
||||||
() => listLitters({ filter: `fatherId=${id}|motherId=${id}`, orderBy: 'date desc', pageSize: 50 }),
|
|
||||||
[id],
|
|
||||||
)
|
|
||||||
const rootLitterItems = rootLitters.data?.items ?? []
|
|
||||||
|
|
||||||
/* ── react-d3-tree-Daten ── */
|
/* ── react-d3-tree-Daten ── */
|
||||||
const nodesByPath = useMemo(() => (root ? collectNodes(root) : null), [root])
|
const nodesByPath = useMemo(() => (root ? collectNodes(root) : null), [root])
|
||||||
const datum = useMemo(() => (root ? toRawNodeDatum(root, t.unknown) : null), [root, t])
|
const datum = useMemo(() => (root ? toRawNodeDatum(root, t.unknown) : null), [root, t])
|
||||||
@@ -323,30 +315,25 @@ export default function StammbaumPage() {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="stammbaum-layout">
|
<div className="stammbaum-canvas" ref={canvasRef}>
|
||||||
{rootLitterItems.length > 0 && (
|
{view && (
|
||||||
<LittersPanel litters={rootLitterItems} t={t} />
|
<Tree
|
||||||
|
key={id}
|
||||||
|
data={datum}
|
||||||
|
renderCustomNodeElement={renderNode}
|
||||||
|
orientation="horizontal"
|
||||||
|
pathFunc="step"
|
||||||
|
translate={view.translate}
|
||||||
|
zoom={view.zoom}
|
||||||
|
scaleExtent={{ min: ZOOM_MIN, max: ZOOM_MAX }}
|
||||||
|
zoomable
|
||||||
|
draggable
|
||||||
|
collapsible={false}
|
||||||
|
nodeSize={{ x: NODE_X, y: NODE_Y }}
|
||||||
|
separation={{ siblings: 1, nonSiblings: 1 }}
|
||||||
|
onUpdate={handleTreeUpdate}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
<div className="stammbaum-canvas" ref={canvasRef}>
|
|
||||||
{view && (
|
|
||||||
<Tree
|
|
||||||
key={id}
|
|
||||||
data={datum}
|
|
||||||
renderCustomNodeElement={renderNode}
|
|
||||||
orientation="horizontal"
|
|
||||||
pathFunc="step"
|
|
||||||
translate={view.translate}
|
|
||||||
zoom={view.zoom}
|
|
||||||
scaleExtent={{ min: ZOOM_MIN, max: ZOOM_MAX }}
|
|
||||||
zoomable
|
|
||||||
draggable
|
|
||||||
collapsible={false}
|
|
||||||
nodeSize={{ x: NODE_X, y: NODE_Y }}
|
|
||||||
separation={{ siblings: 1, nonSiblings: 1 }}
|
|
||||||
onUpdate={handleTreeUpdate}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<ul className="stammbaum-hints">
|
<ul className="stammbaum-hints">
|
||||||
<li>{t.tapHint}</li>
|
<li>{t.tapHint}</li>
|
||||||
@@ -430,36 +417,6 @@ function PedigreeCard({
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Würfe-Panel (STAMMBAUM-LITTERS) ─────────────────────────────── */
|
|
||||||
|
|
||||||
function LittersPanel({
|
|
||||||
litters,
|
|
||||||
t,
|
|
||||||
}: {
|
|
||||||
litters: Litter[]
|
|
||||||
t: { littersTitle: string; littersJunge: string }
|
|
||||||
}) {
|
|
||||||
return (
|
|
||||||
<aside className="stammbaum-litters-panel" aria-label={t.littersTitle}>
|
|
||||||
<div className="stammbaum-litters-panel__title">{t.littersTitle}</div>
|
|
||||||
<ul className="stammbaum-litters-panel__list">
|
|
||||||
{litters.map((l) => (
|
|
||||||
<li key={l.id}>
|
|
||||||
<Link to={`/wuerfe/${l.id}`} className="stammbaum-litters-panel__link">
|
|
||||||
<span className="stammbaum-litters-panel__name">{l.name}</span>
|
|
||||||
{l.totalBorn != null && (
|
|
||||||
<span className="stammbaum-litters-panel__born">
|
|
||||||
{l.totalBorn} {t.littersJunge}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</Link>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
</aside>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function SexIcon({ gender }: { gender: Gender }) {
|
function SexIcon({ gender }: { gender: Gender }) {
|
||||||
const symbol = gender === 'male' ? '♂' : gender === 'female' ? '♀' : '?'
|
const symbol = gender === 'male' ? '♂' : gender === 'female' ? '♀' : '?'
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -45,132 +45,9 @@
|
|||||||
color: var(--color-text-muted);
|
color: var(--color-text-muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Würfe-Panel + Layout (STAMMBAUM-LITTERS) ────────────────── */
|
|
||||||
|
|
||||||
.stammbaum-layout {
|
|
||||||
display: flex;
|
|
||||||
align-items: stretch;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Desktop: Würfe-Panel links vom Baum. */
|
|
||||||
.stammbaum-litters-panel {
|
|
||||||
flex: none;
|
|
||||||
width: 148px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 0.35rem;
|
|
||||||
padding: 0.5rem 0.75rem 0.5rem 0;
|
|
||||||
border-right: 1px solid var(--color-border);
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__title {
|
|
||||||
font-size: 0.7rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.06em;
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__list {
|
|
||||||
list-style: none;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.3rem;
|
|
||||||
overflow-y: auto;
|
|
||||||
max-height: calc(clamp(18rem, 62dvh, 46rem) - 3rem);
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__link {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.1rem;
|
|
||||||
padding: 0.3rem 0.45rem;
|
|
||||||
border-radius: 0.4rem;
|
|
||||||
text-decoration: none;
|
|
||||||
color: inherit;
|
|
||||||
background: var(--color-surface);
|
|
||||||
border: 1px solid var(--color-border);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-family: system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__link:hover {
|
|
||||||
background: var(--color-accent-soft);
|
|
||||||
border-color: var(--color-accent);
|
|
||||||
color: var(--color-accent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__name {
|
|
||||||
font-weight: 600;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__born {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
font-size: 0.72rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Mobil (≤520px): Panel als kompakter horizontaler Streifen ÜBER dem Baum. */
|
|
||||||
@media (max-width: 520px) {
|
|
||||||
.stammbaum-layout {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel {
|
|
||||||
width: auto;
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-start;
|
|
||||||
gap: 0.5rem;
|
|
||||||
padding: 0.4rem 0.5rem;
|
|
||||||
border-right: none;
|
|
||||||
border-bottom: 1px solid var(--color-border);
|
|
||||||
overflow-x: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__title {
|
|
||||||
flex: none;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__list {
|
|
||||||
flex-direction: row;
|
|
||||||
flex-wrap: nowrap;
|
|
||||||
max-height: none;
|
|
||||||
overflow-x: auto;
|
|
||||||
overflow-y: hidden;
|
|
||||||
gap: 0.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__link {
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.35rem;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.stammbaum-litters-panel__born {
|
|
||||||
color: var(--color-text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Canvas behält explizite Höhe in column-Richtung. */
|
|
||||||
.stammbaum-canvas {
|
|
||||||
flex: 0 0 auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Zeichenfläche ────────────────────────────────────────────── */
|
/* ── Zeichenfläche ────────────────────────────────────────────── */
|
||||||
|
|
||||||
.stammbaum-canvas {
|
.stammbaum-canvas {
|
||||||
flex: 1 1 auto;
|
|
||||||
min-width: 0;
|
|
||||||
height: clamp(18rem, 62dvh, 46rem);
|
height: clamp(18rem, 62dvh, 46rem);
|
||||||
border: 1px solid var(--color-border);
|
border: 1px solid var(--color-border);
|
||||||
border-radius: 0.6rem;
|
border-radius: 0.6rem;
|
||||||
|
|||||||
@@ -358,9 +358,6 @@ export const de = {
|
|||||||
/** Mini-Legende unter dem Baum (STAMMBAUM-EXPAND). */
|
/** Mini-Legende unter dem Baum (STAMMBAUM-EXPAND). */
|
||||||
hintName: 'Namenslink: Tierakte öffnen',
|
hintName: 'Namenslink: Tierakte öffnen',
|
||||||
hintExpand: '＋: weitere Vorfahren nachladen',
|
hintExpand: '＋: weitere Vorfahren nachladen',
|
||||||
/** Würfe-Panel links (STAMMBAUM-LITTERS). */
|
|
||||||
littersTitle: 'Würfe',
|
|
||||||
littersJunge: 'Junge',
|
|
||||||
zoomIn: 'Vergrößern',
|
zoomIn: 'Vergrößern',
|
||||||
zoomOut: 'Verkleinern',
|
zoomOut: 'Verkleinern',
|
||||||
zoomFit: 'Ansicht einpassen',
|
zoomFit: 'Ansicht einpassen',
|
||||||
|
|||||||
Reference in New Issue
Block a user