movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging

Browse source 
Conflicts:
	pkgs/servers/serfdom/default.nix
This commit is contained in:
Eelco Dolstra 2014-07-01 11:25:41 +02:00
commit 06fc1ec34d
244 changed files with 5400 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -594,17 +594,17 @@ in
message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
];
users.extraUsers = optional (mainCfg.user == "wwwrun")
users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
group = "wwwrun";
group = mainCfg.group;
description = "Apache httpd user";
uid = config.ids.uids.wwwrun;
};
});
users.extraGroups = optional (mainCfg.group == "wwwrun")
users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton
{ name = "wwwrun";
gid = config.ids.gids.wwwrun;
};
});
environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;