movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

nixos/mjolnir: explicitly set --mjolnir-config

Browse source
This commit is contained in:
Nick Cao 2023-05-15 17:49:54 +08:00
parent adede1eb03
commit c256ecf7a3
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/matrix/mjolnir.nix
View file

@ -30,7 +30,7 @@ let
# these config files will be merged one after the other to build the final config # these config files will be merged one after the other to build the final config
configFiles = [ configFiles = [
"${pkgs.mjolnir}/share/mjolnir/config/default.yaml" "${pkgs.mjolnir}/libexec/mjolnir/deps/mjolnir/config/default.yaml"
moduleConfigFile moduleConfigFile
]; ];
@ -200,7 +200,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = ''${pkgs.mjolnir}/bin/mjolnir''; ExecStart = ''${pkgs.mjolnir}/bin/mjolnir --mjolnir-config ./config/default.yaml'';
ExecStartPre = [ generateConfig ]; ExecStartPre = [ generateConfig ];
WorkingDirectory = cfg.dataPath; WorkingDirectory = cfg.dataPath;
StateDirectory = "mjolnir"; StateDirectory = "mjolnir";