movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge remote-tracking branch 'nixpkgs/master' into staging-next

Browse source 
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
This commit is contained in:
Alyssa Ross 2022-03-31 11:46:46 +00:00
commit ac5a927919
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
109 changed files with 927 additions and 769 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@ let
RAILS_ENV = "production";
NODE_ENV = "production";
LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
# mastodon-web concurrency.
WEB_CONCURRENCY = toString cfg.webProcesses;
MAX_THREADS = toString cfg.webThreads;
@ -121,7 +123,7 @@ in {
Make sure that websockets are forwarded properly. You might want to set up caching
of some requests. Take a look at mastodon's provided nginx configuration at
<code>https://github.com/tootsuite/mastodon/blob/master/dist/nginx.conf</code>.
<code>https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf</code>.
'';
type = lib.types.bool;
default = false;