diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 21:14:05 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 21:14:05 +0100 |
| commit | bfa56d7657e4e4d3f0180e16e20cd7e3e132d919 (patch) | |
| tree | ca9da067a1f8624fa4ee02e782dec48270d94f08 /nixos | |
| parent | 34b0e59c0a01eeabfc67bdfc7f805d053773079b (diff) | |
| download | nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar.gz nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar.bz2 nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar.lz nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar.xz nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.tar.zst nixlib-bfa56d7657e4e4d3f0180e16e20cd7e3e132d919.zip | |
httpd: Only add PHPRC to environment of httpd when enablePHP is true.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2552ec18bb92..d6c539aa78b6 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -628,8 +628,8 @@ in ++ concatMap (svc: svc.extraServerPath) allSubservices; environment = - { PHPRC = if enablePHP then phpIni else ""; - } // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); + (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)) + // optionalAttrs enablePHP { PHPRC = phpIni; }; preStart = '' |