b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #108045 from mmilata/moinmoin-module-fix

Browse source 
nixos/moinmoin: fix module by switching to eventlet worker
This commit is contained in:
Daniël de Kok 2021-02-18 16:13:22 +01:00 committed by GitHub
parent 75107e0f77 97e51c67d4
commit 6e10cf2c1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/web-apps/moinmoin.nix
View file

@ -211,7 +211,7 @@ in
environment = let environment = let
penv = python.buildEnv.override { penv = python.buildEnv.override {
# setuptools: https://github.com/benoitc/gunicorn/issues/1716 # setuptools: https://github.com/benoitc/gunicorn/issues/1716
extraLibs = [ python.pkgs.gevent python.pkgs.setuptools pkg ]; extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ];
}; };
in { in {
PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}";
@ -233,7 +233,7 @@ in
ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \
--name gunicorn-${wikiIdent} \ --name gunicorn-${wikiIdent} \
--workers ${toString cfg.gunicorn.workers} \ --workers ${toString cfg.gunicorn.workers} \
--worker-class gevent \ --worker-class eventlet \
--bind unix:/run/moin/${wikiIdent}/gunicorn.sock --bind unix:/run/moin/${wikiIdent}/gunicorn.sock
''; '';