diff --git a/module.nix b/module.nix index 4809275..73b054f 100644 --- a/module.nix +++ b/module.nix @@ -150,8 +150,8 @@ in "matrix-ooye-pre-start.service" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; requires = [ "matrix-ooye-pre-start.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = lib.getExe config.services.matrix-ooye.package; @@ -167,11 +167,22 @@ in }; }; - systemd.services."matrix-synapse".serviceConfig = lib.mkIf cfg.enableSynapseIntegration { - LoadCredential = [ - "matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml" + systemd.services."matrix-synapse" = lib.mkIf cfg.enableSynapseIntegration { + + after = [ + "matrix-ooye-pre-start.service" + "network-online.target" ]; - ExecStartPre = "+${pkgs.coreutils}/bin/cp /run/credentials/matrix-synapse.service/matrix-ooye-registration ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"; + requires = [ "matrix-ooye-pre-start.service" ]; + serviceConfig = { + LoadCredential = [ + "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" + "+${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 [