diff --git a/modules/nixos/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix index 8c6dadf2..c61bb886 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"; 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 eeaf28db..00000000 Binary files a/secrets/files/services/matrix-appservice-slack/config.yml.age and /dev/null differ diff --git a/secrets/files/services/matrix-appservice-slack/registration.yml.age b/secrets/files/services/matrix-appservice-slack/registration.yml.age deleted file mode 100644 index 5e020eb9..00000000 Binary files a/secrets/files/services/matrix-appservice-slack/registration.yml.age and /dev/null differ