fix mautrix signal service

use my-discord-mautrix
This commit is contained in:
Anish Lakhwara 2023-01-02 19:57:23 +10:00
parent 5e49e3bb44
commit a98ede44c7
2 changed files with 8 additions and 1 deletions

View file

@ -41,11 +41,15 @@
tls = false; tls = false;
} }
]; ];
app_service_config_files = [ app_service_config_files = [
# The registration file is automatically generated after starting the appservice for the first time. # The registration file is automatically generated after starting the appservice for the first time.
# cp /var/lib/matrix-appservice-discord/discord-registration.yaml /var/lib/matrix-synapse/ # cp /var/lib/matrix-appservice-discord/discord-registration.yaml /var/lib/matrix-synapse/
# chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/discord-registration.yaml # chown matrix-synapse:matrix-synapse /var/lib/matrix-synapse/discord-registration.yaml
"/var/lib/matrix-synapse/telegram-registration.yaml" "/var/lib/matrix-synapse/telegram-registration.yaml"
"/var/lib/matrix-synapse/signal-registration.yaml"
"/var/lib/matrix-as-whatsapp/whatsapp-registration.yaml"
"/var/lib/matrix-as-discord/discord-registration.yaml"
# "/var/lib/matrix-synapse/slack-registration.yaml" # "/var/lib/matrix-synapse/slack-registration.yaml"
# "/var/lib/matrix-synapse/discord-registration.yaml" # "/var/lib/matrix-synapse/discord-registration.yaml"
# "/var/lib/matrix-synapse/whatsapp-registration.yaml" # "/var/lib/matrix-synapse/whatsapp-registration.yaml"

View file

@ -28,7 +28,7 @@
discord = { discord = {
port = 29188; port = 29188;
format = "mautrix-go"; format = "mautrix-go";
package = pkgs.mautrix-discord; package = pkgs.my-mautrix-discord;
}; };
signal = { signal = {
@ -38,6 +38,9 @@
serviceConfig = { serviceConfig = {
StateDirectory = [ "matrix-as-signal" "signald" ]; StateDirectory = [ "matrix-as-signal" "signald" ];
SupplementaryGroups = [ "signald" ]; SupplementaryGroups = [ "signald" ];
TimeoutStopSec = 1; # work around the service ignoring SIGTERM, see https://gitlab.com/coffeetables/nix-matrix-appservices/-/issues/12
User = lib.mkForce config.services.signald.user;
Group = lib.mkForce config.services.signald.group;
}; };
settings.signal = { settings.signal = {
socket_path = config.services.signald.socketPath; socket_path = config.services.signald.socketPath;