From 57f2fe314ba9322510d3f9b440a82a3cd5a067be Mon Sep 17 00:00:00 2001 From: mikl Date: Sun, 12 Jul 2026 22:12:33 +0300 Subject: [PATCH] =?UTF-8?q?heather:=20jitsi=20=E2=80=94=20fix=20networks?= =?UTF-8?q?=20to=20top-level=20+=20meet-jitsi=20(no=20dots)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/heather/arion-compose.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hosts/heather/arion-compose.nix b/hosts/heather/arion-compose.nix index 6e29b6f..f8229ed 100644 --- a/hosts/heather/arion-compose.nix +++ b/hosts/heather/arion-compose.nix @@ -45,11 +45,9 @@ # --- Custom network для jitsi с DNS aliases --- # Контейнеры jitsi общаются по FQDN (xmpp.meet.jitsi). Alias задан в # service.networks у prosody. Coturn в host network — вне этой сети. - docker-compose.networks = { - meet.jitsi = { - driver = "bridge"; - }; - }; + # `networks` — top-level опция arion (как `services`), не в docker-compose. + # Имя без точки (docker-compose network name constraint). + networks.meet-jitsi.driver = "bridge"; services = { # === Forgejo (git.iscg.dev) === # Первый сервис, proof-of-concept для цепочки arion→docker→Caddy. @@ -172,7 +170,7 @@ "jitsi-transcripts:/usr/share/jitsi-meet/transcripts" ]; service.depends_on = [ "jitsi-jvb" ]; - service.networks = [ "meet.jitsi" ]; + service.networks = [ "meet-jitsi" ]; service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ]; service.environment = { PUBLIC_URL = "https://jitsi.iscg.dev"; @@ -217,7 +215,7 @@ "jitsi-prosody:/config" ]; # 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.environment = { TZ = "Europe/Moscow"; @@ -237,7 +235,7 @@ service.ports = [ "127.0.0.1:8888:8888" ]; service.volumes = [ "jitsi-jicofo:/config" ]; service.depends_on = [ "jitsi-prosody" ]; - service.networks = [ "meet.jitsi" ]; + service.networks = [ "meet-jitsi" ]; service.env_file = [ "/var/lib/jitsi-secrets/jitsi.env" ]; service.environment = { TZ = "Europe/Moscow";