Merge branch 'master' into ihatemoney

This commit is contained in:
Léo Gaspard
2020-01-09 03:49:03 +01:00
committed by GitHub
8539 changed files with 257718 additions and 176052 deletions
+7 -7
View File
@@ -147,16 +147,16 @@ in {
};
};
users.users = optionalAttrs (cfg.user == "uwsgi") (singleton
{ name = "uwsgi";
users.users = optionalAttrs (cfg.user == "uwsgi") {
uwsgi = {
group = cfg.group;
uid = config.ids.uids.uwsgi;
});
};
};
users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton
{ name = "uwsgi";
gid = config.ids.gids.uwsgi;
});
users.groups = optionalAttrs (cfg.group == "uwsgi") {
uwsgi.gid = config.ids.gids.uwsgi;
};
services.uwsgi.package = pkgs.uwsgi.override {
inherit (cfg) plugins;