nixos/matrix-synapse: use python to launch synapse

launch synapse with the python executable because the startup script is
no longer available
This commit is contained in:
nyanloutre 2019-02-06 15:55:06 +01:00
parent 863e49e3ee
commit eb753318b3

View File

@ -651,12 +651,16 @@ in {
services.postgresql.enable = mkIf usePostgresql (mkDefault true); services.postgresql.enable = mkIf usePostgresql (mkDefault true);
systemd.services.matrix-synapse = { systemd.services.matrix-synapse =
let
python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ]));
in
{
description = "Synapse Matrix homeserver"; description = "Synapse Matrix homeserver";
after = [ "network.target" "postgresql.service" ]; after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
${cfg.package}/bin/homeserver \ ${python.interpreter} -m synapse.app.homeserver \
--config-path ${configFile} \ --config-path ${configFile} \
--keys-directory ${cfg.dataDir} \ --keys-directory ${cfg.dataDir} \
--generate-keys --generate-keys
@ -687,7 +691,7 @@ in {
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true; PermissionsStartOnly = true;
ExecStart = '' ExecStart = ''
${cfg.package}/bin/homeserver \ ${python.interpreter} -m synapse.app.homeserver \
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
--keys-directory ${cfg.dataDir} --keys-directory ${cfg.dataDir}
''; '';