From d90aa69c1ef3d77ce88f144d1f566faa42ef41c3 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Sat, 30 Sep 2023 00:28:14 +0200
Subject: fix jitsi?

---
 host/Rory-nginx/services/jitsi.nix                | 6 +++++-
 host/Rory-nginx/services/nginx/nginx.nix          | 2 +-
 host/Rory-nginx/services/nginx/rory.gay/jitsi.nix | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'host')

diff --git a/host/Rory-nginx/services/jitsi.nix b/host/Rory-nginx/services/jitsi.nix
index 12e60ad..1916b3c 100755
--- a/host/Rory-nginx/services/jitsi.nix
+++ b/host/Rory-nginx/services/jitsi.nix
@@ -3,7 +3,8 @@
 {
   services.jitsi-meet = {
     enable = true;
-    nginx.enable = false;
+    nginx.enable = true;
+    hostName = "jitsi.rory.gay";
     interfaceConfig = {
       APP_NAME = "Rory&'s Jitsi Meet Instance";
       AUDIO_LEVEL_PRIMARY_COLOR = "rgba(255,0,255,0.5)";
@@ -258,6 +259,9 @@
     };
   };
 
+  networking.firewall.allowedTCPPorts = [ 80 443 5349 ];
+  networking.firewall.allowedUDPPorts = [ 10000 ];
+
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
 
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index 3680052..6ce4a51 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -49,7 +49,7 @@
         "catgirlsaresexy.com" = import ./catgirlsaresexy.com/root.nix;
         "sugarcanemc.org" = import ./sugarcanemc.org/root.nix;
 
-        "jitsi.rory.gay" = import ./rory.gay/jitsi.nix;
+        #"jitsi.rory.gay" = import ./rory.gay/jitsi.nix;
 
         #matrix...
         "conduit.rory.gay" = import ./rory.gay/conduit.nix;
diff --git a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
index ee814f4..c2feaa1 100755
--- a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
@@ -37,7 +37,7 @@ in
     alias = "${pkgs.jitsi-meet}/libs/external_api.min.js";
   };
   locations."=/config.js" = lib.mkDefault {
-    alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig;
+    alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (lib.recursiveUpdate defaultCfg cfg.config) cfg.extraConfig;
   };
   locations."=/interface_config.js" = lib.mkDefault {
     alias = overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig "";
-- 
cgit 1.4.1