Henry-Hiles/OOYE-module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix synapse integration

Browse source
This commit is contained in:
Rory& 2024-12-20 16:55:28 +01:00
commit 654df45ec8
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
module.nix
View file

@ -150,8 +150,8 @@ in
"matrix-ooye-pre-start.service" "matrix-ooye-pre-start.service"
"network-online.target" "network-online.target"
]; ];
wantedBy = [ "multi-user.target" ];
requires = [ "matrix-ooye-pre-start.service" ]; requires = [ "matrix-ooye-pre-start.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = lib.getExe config.services.matrix-ooye.package; ExecStart = lib.getExe config.services.matrix-ooye.package;
@ -167,11 +167,22 @@ in
}; };
}; };
systemd.services."matrix-synapse".serviceConfig = lib.mkIf cfg.enableSynapseIntegration { systemd.services."matrix-synapse" = lib.mkIf cfg.enableSynapseIntegration {
after = [
"matrix-ooye-pre-start.service"
"network-online.target"
];
requires = [ "matrix-ooye-pre-start.service" ];
serviceConfig = {
LoadCredential = [ LoadCredential = [
"matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml" "matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml"
]; ];
ExecStartPre = "+${pkgs.coreutils}/bin/cp /run/credentials/matrix-synapse.service/matrix-ooye-registration ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"; ExecStartPre = [
"+${pkgs.coreutils}/bin/cp /run/credentials/matrix-synapse.service/matrix-ooye-registration ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"
"+${pkgs.coreutils}/bin/chown matrix-synapse:matrix-synapse ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"
];
};
}; };
services.matrix-synapse.settings.app_service_config_files = lib.mkIf cfg.enableSynapseIntegration [ services.matrix-synapse.settings.app_service_config_files = lib.mkIf cfg.enableSynapseIntegration [