From cb6903e3d796ab6bd9d7c6e00477dd4b9b3d0373 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Feb 2025 16:27:51 +0100 Subject: [PATCH] cluster/services/matrix: remove discord bridge --- cluster/services/matrix/bridges/discord.nix | 22 --------------------- cluster/services/matrix/default.nix | 1 - cluster/services/matrix/homeserver.nix | 5 +---- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 cluster/services/matrix/bridges/discord.nix diff --git a/cluster/services/matrix/bridges/discord.nix b/cluster/services/matrix/bridges/discord.nix deleted file mode 100644 index fb35376..0000000 --- a/cluster/services/matrix/bridges/discord.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cluster, depot, ... }: -let - inherit (depot.lib.meta) domain; -in -{ - services.matrix-appservice-discord = { - enable = true; - environmentFile = cluster.config.services.matrix.secrets.discordAppServiceToken.path; - settings = { - bridge = { - inherit domain; - homeserverUrl = "https://matrix.${domain}:443"; - disablePresence = false; - disableTypingNotifications = false; - disableDeletionForwarding = false; - enableSelfServiceBridging = true; - disableReadReceipts = false; - disableJoinLeaveNotifications = true; - }; - }; - }; -} diff --git a/cluster/services/matrix/default.nix b/cluster/services/matrix/default.nix index e677ade..8fba4b9 100644 --- a/cluster/services/matrix/default.nix +++ b/cluster/services/matrix/default.nix @@ -10,7 +10,6 @@ homeserver = [ ./homeserver.nix ./coturn.nix - ./bridges/discord.nix ]; static = [ ./federation.nix diff --git a/cluster/services/matrix/homeserver.nix b/cluster/services/matrix/homeserver.nix index 073a4f1..9ccae88 100644 --- a/cluster/services/matrix/homeserver.nix +++ b/cluster/services/matrix/homeserver.nix @@ -77,9 +77,6 @@ in { # HACK: upstream has a weird assertion that doesn't work with our HAProxy setup # this host gets overridden by dbConfigOut database = lib.recursiveUpdate dbConfig.database { args.host = "_patroni.local"; }; - app_service_config_files = [ - "/etc/synapse/discord-registration.yaml" - ]; turn_uris = let combinations = lib.cartesianProduct { proto = [ "udp" "tcp" ]; @@ -115,7 +112,7 @@ in { }; }; systemd.services = lib.mkMerge [ - (lib.genAttrs [ "coturn" "matrix-appservice-discord" "matrix-synapse" ] (_: { + (lib.genAttrs [ "coturn" "matrix-synapse" ] (_: { serviceConfig = { Slice = "communications.slice"; };