diff --git a/modules/system/services/server/socialserver/matrix/coturn/default.nix b/modules/system/services/server/socialserver/matrix/coturn/default.nix deleted file mode 100644 index 5c49d786..00000000 --- a/modules/system/services/server/socialserver/matrix/coturn/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, lib, ... }: -{ - imports = [ ./nginx ]; - - config = lib.mkIf config.services.matrix-synapse.enable { - services = { - coturn = { - enable = true; - no-cli = true; - no-tcp-relay = true; - min-port = 49000; - max-port = 50000; - use-auth-secret = true; - static-auth-secret = config.secrets.coturnSecret; - realm = "turn.jimbosfiles.com"; - cert = "/var/lib/acme/turn.jimbosfiles.com/fullchain.pem"; - pkey = "/var/lib/acme/turn.jimbosfiles.com/key.pem"; - }; - - # Enable coturn on Synapse - matrix-synapse.settings = { - turn_uris = [ - "turn:turn.jimbosfiles.com:3478?transport=udp" - "turn:turn.jimbosfiles.com:3478?transport=tcp" - ]; - turn_shared_secret = config.secrets.coturnSecret; - turn_user_lifetime = "1h"; - }; - - # Sync the IP to Cloudflare - cloudflare-dyndns.domains = [ "turn.jimbosfiles.com" ]; - }; - - # Open coturn ports - networking.firewall = { - allowedUDPPorts = [ - 3478 - 5349 - ]; - allowedUDPPortRanges = [{ - from = config.services.coturn.min-port; - to = config.services.coturn.max-port; - }]; - }; - }; -} diff --git a/modules/system/services/server/socialserver/matrix/coturn/nginx/default.nix b/modules/system/services/server/socialserver/matrix/coturn/nginx/default.nix deleted file mode 100644 index effae071..00000000 --- a/modules/system/services/server/socialserver/matrix/coturn/nginx/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, ... }: -{ - config = lib.mkIf config.services.coturn.enable { - services.nginx.virtualHosts."turn.jimbosfiles.com" = { - enableACME = true; - forceSSL = true; - listen = [{ - addr = "0.0.0.0"; - port = 80; - ssl = false; - }]; - locations."/".proxyPass = "http://127.0.0.1:1380"; - }; - - security.acme.certs = { - "turn.jimbosfiles.com" = { - group = "turnserver"; - postRun = "systemctl restart coturn.service"; - }; - }; - }; -} diff --git a/modules/system/services/server/socialserver/matrix/default.nix b/modules/system/services/server/socialserver/matrix/default.nix index 2a569eee..3f056310 100644 --- a/modules/system/services/server/socialserver/matrix/default.nix +++ b/modules/system/services/server/socialserver/matrix/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./coturn ./element ./synapse ]; diff --git a/modules/system/services/server/socialserver/matrix/synapse/default.nix b/modules/system/services/server/socialserver/matrix/synapse/default.nix index d12cafa3..e10d9b0c 100644 --- a/modules/system/services/server/socialserver/matrix/synapse/default.nix +++ b/modules/system/services/server/socialserver/matrix/synapse/default.nix @@ -12,7 +12,7 @@ public_baseurl = "https://matrix.jimbosfiles.com"; suppress_key_server_warning = true; - # Email notifications about account status + # Email notifications about account status email = { notif_from = "NixFox Matrix "; smtp_host = "mx.nixfox.ca"; diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix index df17cebc..426e2bb3 100644 --- a/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix +++ b/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix @@ -7,16 +7,10 @@ locations = { "/.well-known/matrix/client".extraConfig = '' default_type application/json; - return 200 ' - { - "m.homeserver": { - "base_url": "https://matrix.jimbosfiles.com" - }, - "m.identity_server": { - "base_url": "https://matrix.org" - } - } - '; + return 200 '{ + "m.homeserver": { "base_url": "https://matrix.jimbosfiles.com" }, + "m.identity_server": { "base_url": "https://matrix.org" } + }'; ''; "/.well-known/matrix/server".extraConfig = '' default_type application/json;