public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110770 from rnhmjoj/uwsgi

Browse Source 
nixos/uwsgi: set up the default runtime directory
This commit is contained in:
Michele Guerini Rocco 2021-01-25 15:03:09 +01:00 committed by GitHub
commit 508aacd589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/web-servers/uwsgi.nix
View File

@ -209,6 +209,7 @@ in {
KillSignal = "SIGQUIT"; KillSignal = "SIGQUIT";
AmbientCapabilities = cfg.capabilities; AmbientCapabilities = cfg.capabilities;
CapabilityBoundingSet = cfg.capabilities; CapabilityBoundingSet = cfg.capabilities;
RuntimeDirectory = mkIf (cfg.runDir == "/run/uwsgi") "uwsgi";
}; };
}; };

5
nixos/tests/searx.nix
View File

@ -81,8 +81,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
base.wait_for_unit("searx-init") base.wait_for_unit("searx-init")
base.wait_for_file("/run/searx/settings.yml") base.wait_for_file("/run/searx/settings.yml")
output = base.succeed( output = base.succeed(
"${pkgs.yq-go}/bin/yq r /run/searx/settings.yml" "${pkgs.yq-go}/bin/yq eval"
" 'engines.(name==startpage).shortcut'" " '.engines[] | select(.name==\"startpage\") | .shortcut'"
" /run/searx/settings.yml"
).strip() ).strip()
assert output == "start", "Settings not merged" assert output == "start", "Settings not merged"