httpd: Only add PHPRC to environment of httpd when enablePHP is true.

This commit is contained in:
Rob Vermaas 2014-01-31 21:14:05 +01:00
parent 34b0e59c0a
commit bfa56d7657

View file

@ -628,8 +628,8 @@ in
++ concatMap (svc: svc.extraServerPath) allSubservices; ++ concatMap (svc: svc.extraServerPath) allSubservices;
environment = environment =
{ PHPRC = if enablePHP then phpIni else ""; (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices))
} // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); // optionalAttrs enablePHP { PHPRC = phpIni; };
preStart = preStart =
'' ''