movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge: nixos/matrix-synapse: Fix merging log configuration (#409839)

Browse source
This commit is contained in:
Maximilian Bosch 2025-06-07 12:48:22 +02:00 • committed by GitHub
commit cf0370b028
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/services/matrix/synapse.nix
View file

@ -124,12 +124,13 @@ let
genLogConfigFile =
logName:
format.generate "synapse-log-${logName}.yaml" (
cfg.log
// optionalAttrs (cfg.log ? handlers.journal) {
handlers.journal = cfg.log.handlers.journal // {
SYSLOG_IDENTIFIER = logName;
};
}
attrsets.recursiveUpdate cfg.log (
optionalAttrs (cfg.log ? handlers.journal) {
handlers.journal = cfg.log.handlers.journal // {
SYSLOG_IDENTIFIER = logName;
};
}
)
);
toIntBase8 =