mikl/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

heather: jitsi — fix networks to top-level + meet-jitsi (no dots)

Browse source
This commit is contained in:
mikl 2026-07-12 22:12:33 +03:00
parent 2d37b744e6
commit 57f2fe314b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hosts/heather/arion-compose.nix
View file

@ -45,11 +45,9 @@
# --- Custom network для jitsi с DNS aliases --- # --- Custom network для jitsi с DNS aliases ---
# Контейнеры jitsi общаются по FQDN (xmpp.meet.jitsi). Alias задан в # Контейнеры jitsi общаются по FQDN (xmpp.meet.jitsi). Alias задан в
# service.networks у prosody. Coturn в host network — вне этой сети. # service.networks у prosody. Coturn в host network — вне этой сети.
docker-compose.networks = { # `networks` — top-level опция arion (как `services`), не в docker-compose.
meet.jitsi = { # Имя без точки (docker-compose network name constraint).
driver = "bridge"; networks.meet-jitsi.driver = "bridge";
};
};
services = { services = {
# === Forgejo (git.iscg.dev) === # === Forgejo (git.iscg.dev) ===
# Первый сервис, proof-of-concept для цепочки arion→docker→Caddy. # Первый сервис, proof-of-concept для цепочки arion→docker→Caddy.
@ -172,7 +170,7 @@
"jitsi-transcripts:/usr/share/jitsi-meet/transcripts" "jitsi-transcripts:/usr/share/jitsi-meet/transcripts"
]; ];
service.depends_on = [ "jitsi-jvb" ]; service.depends_on = [ "jitsi-jvb" ];
service.networks = [ "meet.jitsi" ]; service.networks = [ "meet-jitsi" ];
service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ]; service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ];
service.environment = { service.environment = {
PUBLIC_URL = "https://jitsi.iscg.dev"; PUBLIC_URL = "https://jitsi.iscg.dev";
@ -217,7 +215,7 @@
"jitsi-prosody:/config" "jitsi-prosody:/config"
]; ];
# network aliases: prosody доступен как xmpp.meet.jitsi для jicofo/jvb/web # network aliases: prosody доступен как xmpp.meet.jitsi для jicofo/jvb/web
service.networks = { "meet.jitsi".aliases = [ "xmpp.meet.jitsi" ]; }; service.networks.meet-jitsi.aliases = [ "xmpp.meet.jitsi" ];
service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ]; service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ];
service.environment = { service.environment = {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
@ -237,7 +235,7 @@
service.ports = [ "127.0.0.1:8888:8888" ]; service.ports = [ "127.0.0.1:8888:8888" ];
service.volumes = [ "jitsi-jicofo:/config" ]; service.volumes = [ "jitsi-jicofo:/config" ];
service.depends_on = [ "jitsi-prosody" ]; service.depends_on = [ "jitsi-prosody" ];
service.networks = [ "meet.jitsi" ]; service.networks = [ "meet-jitsi" ];
service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ]; service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ];
service.environment = { service.environment = {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";