c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/matrix-authentication-services: fix extraConfigFiles param permission issue

Browse source
This commit is contained in:
eymeric 2026-07-01 08:50:20 +07:00
commit 658c5fefa7
No known key found for this signature in database
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/matrix/matrix-authentication-service.nix
View file

@ -43,6 +43,9 @@ let
else
pruned;
configFile = format.generate "config.yaml" finalSettings;
extraConfigArgs = lib.imap0 (i: _: "%d/config-${toString i}") cfg.extraConfigFiles;
configFileArgs = [ configFile ] ++ extraConfigArgs;
in
{
meta.maintainers = with lib.maintainers; [
@ -388,13 +391,14 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
DynamicUser = true;
LoadCredential = lib.imap0 (i: path: "config-${toString i}:${path}") cfg.extraConfigFiles;
ExecStartPre = ''
${getExe cfg.package} config check \
${concatMapStringsSep " " (x: "--config ${x}") ([ configFile ] ++ cfg.extraConfigFiles)}
${concatMapStringsSep " " (x: "--config ${x}") configFileArgs}
'';
ExecStart = ''
${getExe cfg.package} server \
${concatMapStringsSep " " (x: "--config ${x}") ([ configFile ] ++ cfg.extraConfigFiles)}
${concatMapStringsSep " " (x: "--config ${x}") configFileArgs}
'';
Restart = "on-failure";
RestartSec = "1s";
@ -436,6 +440,7 @@ in
# Working and state directories
StateDirectory = "matrix-authentication-service";
StateDirectoryMode = "0700";
RuntimeDirectory = "matrix-authentication-service";
WorkingDirectory = "/var/lib/matrix-authentication-service";
};
};