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

Pass signing_key_path through LoadCredential

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-01-26 21:12:20 +09:00
parent a18c7d129f
commit b6d3f51fa1
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse-module/default.nix
+2
View File
@@ -13,6 +13,7 @@ let
matrix-synapse-common-config = format.generate "matrix-synapse-common-config.yaml" (cfg.settings // { matrix-synapse-common-config = format.generate "matrix-synapse-common-config.yaml" (cfg.settings // {
listeners = map (lib.filterAttrsRecursive (_: v: v != null)) cfg.settings.listeners; listeners = map (lib.filterAttrsRecursive (_: v: v != null)) cfg.settings.listeners;
media_store_path = "/var/lib/matrix-synapse/media_store"; media_store_path = "/var/lib/matrix-synapse/media_store";
signing_key_path = "/run/credentials/matrix-synapse.service/signing_key";
}); });
# TODO: Align better with the upstream module # TODO: Align better with the upstream module
@@ -511,6 +512,7 @@ in
(lib.filter (path: path != "/run/matrix-synapse")) (lib.filter (path: path != "/run/matrix-synapse"))
lib.uniqueStrings lib.uniqueStrings
]; ];
LoadCredential = [ "signing_key:${cfg.settings.signing_key_path}" ];
RemoveIPC = true; RemoveIPC = true;
RestrictAddressFamilies = [ RestrictAddressFamilies = [
"AF_INET" "AF_INET"
synapse-module/workers.nix
+2
View File
@@ -375,6 +375,7 @@ in {
worker_name = worker.name; worker_name = worker.name;
worker_listeners = worker_listeners =
map (lib.filterAttrsRecursive (_: v: v != null)) worker.value.settings.worker_listeners; map (lib.filterAttrsRecursive (_: v: v != null)) worker.value.settings.worker_listeners;
signing_key_path = "/run/credentials/matrix-synapse-worker-${worker.name}.service/signing_key";
}); });
in builtins.listToAttrs (lib.flip map workerList (worker: { in builtins.listToAttrs (lib.flip map workerList (worker: {
name = "matrix-synapse-worker-${worker.name}"; name = "matrix-synapse-worker-${worker.name}";
@@ -448,6 +449,7 @@ in {
(lib.filter (path: path != "/run/matrix-synapse")) (lib.filter (path: path != "/run/matrix-synapse"))
lib.uniqueStrings lib.uniqueStrings
]; ];
LoadCredential = [ "signing_key:${cfg.settings.signing_key_path}" ];
RemoveIPC = true; RemoveIPC = true;
RestrictAddressFamilies = [ RestrictAddressFamilies = [
"AF_INET" "AF_INET"