Skip to content

Commit cf0370b

Browse files
authored
Merge: nixos/matrix-synapse: Fix merging log configuration (#409839)
2 parents 68f6944 + 28189a7 commit cf0370b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

nixos/modules/services/matrix/synapse.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,13 @@ let
124124
genLogConfigFile =
125125
logName:
126126
format.generate "synapse-log-${logName}.yaml" (
127-
cfg.log
128-
// optionalAttrs (cfg.log ? handlers.journal) {
129-
handlers.journal = cfg.log.handlers.journal // {
130-
SYSLOG_IDENTIFIER = logName;
131-
};
132-
}
127+
attrsets.recursiveUpdate cfg.log (
128+
optionalAttrs (cfg.log ? handlers.journal) {
129+
handlers.journal = cfg.log.handlers.journal // {
130+
SYSLOG_IDENTIFIER = logName;
131+
};
132+
}
133+
)
133134
);
134135

135136
toIntBase8 =

0 commit comments

Comments
 (0)