nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 07:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/matrix-authentication-service: use env var instead of %d (#540984)

Browse Source
This commit is contained in:
Maximilian Bosch
2026-07-14 19:57:30 +00:00
committed by GitHub
parent cc774539cf 9c71adbeb5
commit 6fadb09232
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/matrix/matrix-authentication-service.nix
View File

@@ -45,7 +45,9 @@ let
pruned;
configFile = format.generate "config.yaml" finalSettings;
extraConfigFiles = lib.imap0 (i: _: "%d/config-${toString i}") cfg.extraConfigFiles;
extraConfigFiles = lib.imap0 (
i: _: "\${CREDENTIALS_DIRECTORY}/config-${toString i}"
) cfg.extraConfigFiles;
runtimeConfig = "/run/matrix-authentication-service/config.yaml";
in
{

25
nixos/tests/matrix/matrix-authentication-service.nix
View File

@@ -189,11 +189,26 @@ in
{ nodes, ... }:
let
bundle = mkBundle masDomain;
extraConfig = pkgs.writeText "masExtraConfig.yml" (
builtins.toJSON {
secrets = {
encryption_file = "/var/lib/matrix-authentication-service/encryption";
keys = [
{
kid = "rsa-4096";
key_file = "/var/lib/matrix-authentication-service/key_rsa_4096";
}
];
};
}
);
in
{
services.matrix-authentication-service = {
enable = true;
createDatabase = true;
extraConfigFiles = [ (toString extraConfig) ];
settings = {
http = {
public_base = "https://${masDomain}:8080/";
@@ -223,15 +238,7 @@ in
secret_file = "/var/lib/matrix-authentication-service/matrix_secret";
};
database.uri = "postgresql:///matrix-authentication-service?host=/run/postgresql&user=matrix-authentication-service";
secrets = {
encryption_file = "/var/lib/matrix-authentication-service/encryption";
keys = [
{
kid = "rsa-4096";
key_file = "/var/lib/matrix-authentication-service/key_rsa_4096";
}
];
};
# secrets is defined in extraConfigFiles
policy.data.client_registration.allow_insecure_uris = true;
upstream_oauth2.providers = [
{