danio/nixos-matrix-modules
0
2
Fork 1
mirror of https://github.com/dali99/nixos-matrix-modules.git synced 2026-06-23 00:17:57 +02:00
Code Issues Releases Activity

Merge pull request #17 from h7x4/fix-worker-load-creds

Browse Source 
workers: fix `LoadCredential` signing key passthrough
This commit is contained in:
Daniel Lovbrotte Olsen
2026-06-22 11:54:27 +02:00
committed by GitHub
parent 2afe9fe63d 31e5b1ff26
commit 0e0fd9f6a4
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse-module/workers.nix
+13 -6
View File
@@ -372,12 +372,19 @@ in {
systemd.services = let
workerList = lib.mapAttrsToList lib.nameValuePair wcfg.instances;
workerConfig = worker:
format.generate "matrix-synapse-worker-${worker.name}-config.yaml"
(worker.value.settings // {
worker_name = worker.name;
worker_listeners =
map (lib.filterAttrsRecursive (_: v: v != null)) worker.value.settings.worker_listeners;
});
format.generate "matrix-synapse-worker-${worker.name}-config.yaml" (
worker.value.settings
//
{
worker_name = worker.name;
worker_listeners = map (lib.filterAttrsRecursive (_: v: v != null)) worker.value.settings.worker_listeners;
}
//
# NOTE: the workers cannot pick up creds from `/run/credentials/matrix-synapse.service/*`
(lib.optionalAttrs usesCustomSigningKeyPath {
signing_key_path = "/run/credentials/matrix-synapse-worker-${worker.name}.service/signing_key";
})
);
in builtins.listToAttrs (lib.flip map workerList (worker: {
name = "matrix-synapse-worker-${worker.name}";
value = {