Merge pull request #61 from DarkKirb/hotfix-synapse

bruh
This commit is contained in:
Charlotte 🦝 Delenk 2022-11-23 20:51:01 +01:00 committed by GitHub
commit aaa13f33aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6,15 +6,15 @@
}: }:
with lib; let with lib; let
dataDir = "/var/lib/mautrix-telegram"; dataDir = "/var/lib/mautrix-telegram";
registrationFile = "${dataDir}/signal-registration.yaml"; registrationFile = "${dataDir}/telegram-registration.yaml";
cfg = config.services.mautrix-telegram-2; cfg = config.services.mautrix-telegram-2;
settingsFormat = pkgs.formats.yaml {}; settingsFormat = pkgs.formats.yaml {};
settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-signal-unsubstituted.yaml" cfg.settings; settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-config-unsubstituted.yaml" cfg.settings;
settingsFile = "${dataDir}/config.yaml"; settingsFile = "${dataDir}/config.yaml";
in { in {
options = { options = {
services.mautrix-telegram-2 = { services.mautrix-telegram-2 = {
enable = mkEnableOption "mautrix-telegram, a Matrix-signal hybrid puppeting/relaybot bridge"; enable = mkEnableOption "mautrix-telegram, a Matrix-telegram hybrid puppeting/relaybot bridge";
settings = mkOption rec { settings = mkOption rec {
apply = recursiveUpdate default; apply = recursiveUpdate default;
inherit (settingsFormat) type; inherit (settingsFormat) type;