Fix configuring apache with extra user/group

This fix is consistent with all the other modules.
This commit is contained in:
Kirill Elagin 2014-06-11 13:17:42 +04:00
parent 80721cdd41
commit 1208dd4df0

View File

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