From fd5a5566335d3f33e4441f0cf6f2dc60045b428e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 28 Apr 2025 10:48:10 +0200 Subject: [PATCH] Remove matrix-appservice-slack --- modules/nixos/services/matrix/default.nix | 42 ------------------ secrets.nix | 2 - .../matrix-appservice-slack/config.yml.age | Bin 5902 -> 0 bytes .../registration.yml.age | Bin 836 -> 0 bytes 4 files changed, 44 deletions(-) delete mode 100644 secrets/files/services/matrix-appservice-slack/config.yml.age delete mode 100644 secrets/files/services/matrix-appservice-slack/registration.yml.age diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix index 8c6dadf2..c4dc4ffb 100644 --- a/modules/nixos/services/matrix/default.nix +++ b/modules/nixos/services/matrix/default.nix @@ -19,12 +19,6 @@ client_max_body_size 10M; ''; }; - "/_slack" = { - proxyPass = "http://127.0.0.1:9898"; - extraConfig = '' - proxy_set_header X-Forwarded-Ssl on; - ''; - }; "~ ^/_hookshot/(.*)" = { proxyPass = "http://127.0.0.1:9000/$1"; extraConfig = '' @@ -60,7 +54,6 @@ suppress_key_server_warning = true; app_service_config_files = [ config.age.secrets."files/services/matrix-synapse/whatsapp-registration.yml".path - config.age.secrets."files/services/matrix-synapse/slack-registration.yml".path config.age.secrets."files/services/matrix-synapse/hookshot-registration.yml".path ]; }; @@ -73,14 +66,9 @@ enable = true; ensureDatabases = [ "matrix-synapse" - "matrix-appservice-slack" "mautrix-whatsapp" ]; ensureUsers = [ - { - name = "matrix-appservice-slack"; - ensureDBOwnership = true; - } { name = "mautrix-whatsapp"; ensureDBOwnership = true; @@ -94,17 +82,6 @@ }; systemd.services = { - matrix-appservice-slack = { - description = "Matrix <-> Slack bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "postgresql.service" "matrix-synapse.service" ]; - requires = [ "postgresql.service" "matrix-synapse.service" ]; - script = "${pkgs.matrix-appservice-slack}/bin/matrix-appservice-slack --config ${config.age.secrets."files/services/matrix-appservice-slack/config.yml".path} --file ${config.age.secrets."files/services/matrix-appservice-slack/registration.yml".path}"; - serviceConfig = { - User = "matrix-appservice-slack"; - Group = "matrix-appservice-slack"; - }; - }; matrix-synapse = { requires = [ "postgresql.service" ]; }; @@ -135,12 +112,6 @@ users = { users = { - matrix-appservice-slack = { - group = "matrix-appservice-slack"; - home = "/var/lib/matrix-appservice-slack"; - createHome = true; - isSystemUser = true; - }; mautrix-whatsapp = { group = "mautrix-whatsapp"; home = "/var/lib/mautrix-whatsapp"; @@ -155,20 +126,11 @@ }; }; groups = { - matrix-appservice-slack = { }; matrix-hookshot = { }; mautrix-whatsapp = { }; }; }; - age.secrets."files/services/matrix-appservice-slack/config.yml" = { - file = ../../../../secrets/files/services/matrix-appservice-slack/config.yml.age; - owner = "matrix-appservice-slack"; - }; - age.secrets."files/services/matrix-appservice-slack/registration.yml" = { - file = ../../../../secrets/files/services/matrix-appservice-slack/registration.yml.age; - owner = "matrix-appservice-slack"; - }; age.secrets."files/services/matrix-hookshot/config.yml" = { file = ../../../../secrets/files/services/matrix-hookshot/config.yml.age; owner = "matrix-hookshot"; @@ -194,10 +156,6 @@ file = ../../../../secrets/files/services/matrix-synapse/config.yml.age; owner = "matrix-synapse"; }; - age.secrets."files/services/matrix-synapse/slack-registration.yml" = { - file = ../../../../secrets/files/services/matrix-appservice-slack/registration.yml.age; - owner = "matrix-synapse"; - }; age.secrets."files/services/matrix-synapse/whatsapp-registration.yml" = { file = ../../../../secrets/files/services/mautrix-whatsapp/registration.yml.age; owner = "matrix-synapse"; diff --git a/secrets.nix b/secrets.nix index 6824014b..e4b18bc5 100644 --- a/secrets.nix +++ b/secrets.nix @@ -76,8 +76,6 @@ in "secrets/files/programs/transmission/config.json.age".publicKeys = [ elendel ] ++ users; - "secrets/files/services/matrix-appservice-slack/config.yml.age".publicKeys = [ marabethia ] ++ users; - "secrets/files/services/matrix-appservice-slack/registration.yml.age".publicKeys = [ marabethia ] ++ users; "secrets/files/services/matrix-hookshot/config.yml.age".publicKeys = [ marabethia ] ++ users; "secrets/files/services/matrix-hookshot/passkey.pem.age".publicKeys = [ marabethia ] ++ users; "secrets/files/services/matrix-hookshot/registration.yml.age".publicKeys = [ marabethia ] ++ users; diff --git a/secrets/files/services/matrix-appservice-slack/config.yml.age b/secrets/files/services/matrix-appservice-slack/config.yml.age deleted file mode 100644 index eeaf28db06ee9df3637da7de4f497d9994506fff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5902 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 H>gQtt_dr=N