From e5d521b51caa58524bb4c81f2492ddda4e833890 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Fri, 14 Mar 2025 22:51:40 +0000 Subject: [PATCH] [add] oi.quodatum.duckdns.org --- caddy/Caddyfile | 5 + caddy/site/quodatum/network.svg | 534 ++++++++++++++++++-------------- caddy/site/quodatum/saffron.gv | 25 +- 3 files changed, 334 insertions(+), 230 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 5d92866..ff77dec 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -108,6 +108,11 @@ quodatum.duckdns.org { } @shark host shark.quodatum.duckdns.org handle @shark { + import auth_quodatum + import fins 3001 + } + @oi host oi.quodatum.duckdns.org + handle @oi { import auth_quodatum import xu4 4000 } diff --git a/caddy/site/quodatum/network.svg b/caddy/site/quodatum/network.svg index d5787c5..1ea889a 100644 --- a/caddy/site/quodatum/network.svg +++ b/caddy/site/quodatum/network.svg @@ -1,454 +1,538 @@ - - + + - - + + - -The Internet + +The Internet - + - -quodatum.duckdns.org + +quodatum.duckdns.org - + - -orlop.duckdns.org + +orlop.duckdns.org - + - -Server Boxes + +Server Boxes - + - -xu4 + + +xu4 + - - - -fins - + - -omv + +fins - + - -odroid-n2 + +omv - + - -n2-plus + +odroid-n2 + + + + +n2-plus - + - - -wiki + + +wiki - + - - -tiddy-wiki:8088 + + +tiddy-wiki:8088 - + - - + + - + - - -about + + +about - + - -caddy + +caddy - + - - + + - + - - -git + + +git - + - - -forgejo:8300 + + +forgejo:8300 - + - - + + - - + + - - -vscode + + +oi - - + + - - -about + + +olama:11434 + + + + + + + + + + + + + + +about - + - - + + - + - - -kodi + + +kodi - + - - -kodi:8080 + + +kodi:8080 - + - - + + - + - - -tvheadend + + +tvheadend - + - - -tvheadend:9981 + + +tvheadend:9981 - + - - + + - + - - -emby + + +emby - + - - -emby:8097 + + +emby:8097 - + - - + + - + - - -jellyfin + + +jellyfin - + - - -jellyfin:8096 + + +jellyfin:8096 - + - - + + - + - - -Immich + + +Immich - + - - -immich:2283 + + +immich:2283 - + - - + + - + - -vpn + +vpn - + - - -wireguard:51820 + + +wireguard:51820 - + - - - - - - - - -olama:11434 - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - -basex-test:9090 + + +basex-test:9090 - + - - -wireshark:4000 + + +wireshark:4000 - + - - -redis-test:6379 + + +redis-test:6379 - + - - -pihole + + +pihole - - + + - - -openwebui:3001 + + +beszel-agent - + - - -beszel::8090 + + +beszel::8090 + + + + + + + + + + + + + + +openwebui:3001 - + - - -shotcut::3100 + + +shotcut::3100 - - + + - - -omv:81 + + +beszel-agent + + + + + + + + + + + + + + +omv:81 - + - - -vikunja:3456 + + +vikunja:3456 - + - - -dockge:5001 + + +dockge:5001 - - + + - - -p + + +beszel-agent + + + + + + + + + + + + + + +beszel-agent + + + + + + + + + + + + + + +p - + - - -n + + +n - + - - -portainer:9443 + + +portainer:9443 - + - - -netdata:19999 + + +netdata:19999 - + - - -ntopng:3000 + + +ntopng:3000 + + + + + +beszel-agent + + + + + + + + + \ No newline at end of file diff --git a/caddy/site/quodatum/saffron.gv b/caddy/site/quodatum/saffron.gv index 62e270b..9dc4027 100644 --- a/caddy/site/quodatum/saffron.gv +++ b/caddy/site/quodatum/saffron.gv @@ -3,9 +3,9 @@ digraph saffron { compound = true; rankdir = LR; - rank = same; - nodesep = 0.2; - ranksep = 1.5; + + + node [fontname = "helvetica"; shape = box; style = filled; width = "2"; fillcolor = white; target = "saffron";]; edge [fontname = "Arial";]; ratio = "0.8"; @@ -20,7 +20,8 @@ digraph saffron { a1 [label = "wiki";href = "https://wiki.quodatum.duckdns.org";tooltip = "Tiddly wiki";]; a2 [label = "about";href = "https://about.quodatum.duckdns.org";tooltip = "about";]; a3 [label = "git";href = "https://git.quodatum.duckdns.org";tooltip = "Forgejo";]; - a4 [label = "vscode";href = "https://vscode.quodatum.duckdns.org";tooltip = "VScode";]; + a5 [label = "oi";href = "https://oi.quodatum.duckdns.org";tooltip = "openwebUI";]; + } subgraph cluster_b { bgcolor = "#BDFFA4"; @@ -40,6 +41,8 @@ digraph saffron { fontsize = "30"; subgraph cluster_c { label = "xu4"; + href="http://fins.local:8090/system/xu4"; + tooltip="XU4 on beszel"; bgcolor = "#FFDEAD"; c0 [label = "caddy";]; c1 [label = "basex-test:9090";href = "http://odroid.local:9090";tooltip = "Basex 10.7";]; @@ -49,14 +52,16 @@ digraph saffron { c6 [label = "redis-test:6379";tooltip = "Redis API";]; c7 [label = "pihole";href = "http://192.168.1.59";tooltip = "PiHole Ad blocker";]; + c8 [label = "beszel-agent";href = "http://fins.local:8090/system/xu4";tooltip = "Beszel";]; } subgraph cluster_d { label = "fins"; bgcolor = "#FFDEAD"; d2 [label = "olama:11434";href = "http://fins.local:11434/";tooltip = "Ollama (AI)";]; d4 [label = "openwebui:3001";href = "http://fins.local:3001/";tooltip = "Open WebUI";]; - d5 [label = "beszel::8090";href = "http://fins.local:8090/";tooltip = "monitor";]; + d5 [label = "beszel::8090";href = "http://fins.local:8090/";tooltip = "beszel (main)";]; d6 [label = "shotcut::3100";href = "http://fins.local:3100/";tooltip = "Vidio editor";]; + d7 [label = "beszel-agent";href = "http://fins.local:8090/system/fins";tooltip = "Beszel agent";]; } subgraph cluster_e { label = "omv"; @@ -68,16 +73,19 @@ digraph saffron { e5 [label = "vikunja:3456";href = "http://omv.local:3456/";tooltip = "Vikunja";]; e6 [label = "dockge:5001";href = "http://omv.local:5001/";tooltip = "dockge";]; e7 [label = "immich:2283";href = "http://omv.local:2283/";tooltip = "Photos";]; + e8 [label = "beszel-agent";href = "http://fins.local:8090/system/omv";tooltip = "Beszel agent";]; } subgraph cluster_f { label = "odroid-n2"; rankdir=TB bgcolor = "#FFDEAD"; f1 [label = "kodi:8080";href = "http://odroid-n2:8080";tooltip = "kodi";]; + f2 [label = "beszel-agent";href = "http://fins.local:8090/system/odroid-n2";tooltip = "Beszel agent";]; rank=max; x1 [label = "p";shape = "oval"; area=0.1 href = "https://odroid-n2:9443";tooltip = "portainer"; fillcolor=yellow ;]; x2 [label = "n";shape = "oval";href = "http://odroid-n2:19999";tooltip = "netdata"; fillcolor=yellow ;]; + @@ -89,12 +97,14 @@ digraph saffron { g2 [label = "portainer:9443";href = "https://n2-plus.local:9443";tooltip = "portainer";]; g3 [label = "netdata:19999";href = "http://n2-plus.local:19999";tooltip = "netdata";]; g4 [label = "ntopng:3000";href = "http://n2-plus.local:3000";tooltip = "ntop ng";]; + g5 [label = "beszel-agent";href = "http://fins.local:8090/system/n2-plus";tooltip = "Beszel";]; } } a2 -> c0; b1 -> c0; a1 -> c2; a3 -> e1; + a5 -> d2; b2 -> f1; b3 -> g1; b4 -> e3; @@ -105,4 +115,9 @@ digraph saffron { c0 -> f1 [ltail = "cluster_c"; lhead = "cluster_f"; style = "dotted";]; c0 -> e1 [ltail = "cluster_c"; lhead = "cluster_e"; style = "dotted";]; c0 -> g1 [ltail = "cluster_c"; lhead = "cluster_g"; style = "dotted";]; + c8 -> d5; + d7 -> d5; + e8 -> d5; + f2 -> d5; + g5 -> d5; } \ No newline at end of file