suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Revert "nixos/matrix-synapse: use python to launch synapse"

Browse Source 
This reverts commit eb753318b3.

The homeserver script has been restored with commit
0c663e9032.
This commit is contained in:
pacien 2019-02-23 20:58:28 +01:00
parent 0c663e9032
commit cb15d762f4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/misc/matrix-synapse.nix
View File

@ -651,16 +651,12 @@ 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 = ''
${python.interpreter} -m synapse.app.homeserver \ ${cfg.package}/bin/homeserver \
--config-path ${configFile} \ --config-path ${configFile} \
--keys-directory ${cfg.dataDir} \ --keys-directory ${cfg.dataDir} \
--generate-keys --generate-keys
@ -691,7 +687,7 @@ in {
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
PermissionsStartOnly = true; PermissionsStartOnly = true;
ExecStart = '' ExecStart = ''
${python.interpreter} -m synapse.app.homeserver \ ${cfg.package}/bin/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}
''; '';