diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix index 8e289ce..e29b72f 100644 --- a/modules/services/server/matrix.nix +++ b/modules/services/server/matrix.nix @@ -70,12 +70,12 @@ in { ]; } ]; + app_service_config_files = [ +# "/var/lib/matrix-synapse/whatsapp-registration.yaml" + config.age.secrets."services/matrix/telegram-registration.yml".path; +# "/var/lib/matrix-synapse/signal-registration.yaml" + ]; }; -# app_service_config_files = [ -# "/var/lib/matrix-synapse/whatsapp-registration.yaml" -# "/var/lib/matrix-synapse/telegram-registration.yaml" -# "/var/lib/matrix-synapse/signal-registration.yaml" -# ]; extraConfigFiles = [ config.age.secrets."services/matrix/synapse.yml".path ]; @@ -85,6 +85,10 @@ in { file = ../../../secrets/services/matrix/synapse.age; owner = "matrix-synapse"; }; + age.secrets."services/matrix/telegram-registration.yml" = { + file = ../../../secrets/services/matrix/telegram-registration.age; + owner = "matrix-synapse"; + }; systemd.services = { matrix-synapse = { @@ -94,30 +98,30 @@ in { users = { users = { - mautrix_whatsapp = { + mautrix-whatsapp = { uid = 3001; - group = "mautrix_whatsapp"; + group = "mautrix-whatsapp"; isSystemUser = true; }; - mautrix_telegram = { + mautrix-telegram = { uid = 3002; - group = "mautrix_telegram"; + group = "mautrix-telegram"; isSystemUser = true; }; - mautrix_signal = { + mautrix-signal = { uid = 3003; - group = "mautrix_signal"; + group = "mautrix-signal"; isSystemUser = true; }; }; groups = { - mautrix_whatsapp = { + mautrix-whatsapp = { gid = 3001; }; - mautrix_telegram = { + mautrix-telegram = { gid = 3002; }; - mautrix_signal = { + mautrix-signal = { gid = 3003; }; }; @@ -169,7 +173,7 @@ in { age.secrets."services/matrix/mautrix-telegram.env" = { file = ../../../secrets/services/matrix/mautrix-telegram.age; - owner = "mautrix-telegram"; + owner = "mautrix_telegram"; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8a3601c..2b9565c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -35,6 +35,7 @@ in "services/coturn/static-auth.age".publicKeys = servers ++ users; "services/matrix/synapse.age".publicKeys = servers ++ users; "services/matrix/mautrix-telegram.age".publicKeys = servers ++ users; + "services/matrix/telegram-registration.age".publicKeys = servers ++ users; "services/nextcloud/adminpassFile.age".publicKeys = servers ++ users; "services/nextcloud/dbpassFile.age".publicKeys = servers ++ users; } diff --git a/secrets/services/matrix/mautrix-telegram.age b/secrets/services/matrix/mautrix-telegram.age index 7a3f3f0..e585f34 100644 Binary files a/secrets/services/matrix/mautrix-telegram.age and b/secrets/services/matrix/mautrix-telegram.age differ diff --git a/secrets/services/matrix/telegram-registration.age b/secrets/services/matrix/telegram-registration.age new file mode 100644 index 0000000..f410216 Binary files /dev/null and b/secrets/services/matrix/telegram-registration.age differ