diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 21:18:24 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 21:18:24 +0100 |
| commit | 9b1bd849402d208e7f0c8a0c0032adca41ab74e4 (patch) | |
| tree | 3f92d78513c476e4300505db4d9eef648cbc07b6 /nixos | |
| parent | bfa56d7657e4e4d3f0180e16e20cd7e3e132d919 (diff) | |
| download | nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar.gz nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar.bz2 nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar.lz nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar.xz nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.tar.zst nixlib-9b1bd849402d208e7f0c8a0c0032adca41ab74e4.zip | |
httpd: Respect original order of environment eval.
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 d6c539aa78b6..b96f5cf159b0 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 = - (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)) - // optionalAttrs enablePHP { PHPRC = phpIni; }; + optionalAttrs enablePHP { PHPRC = phpIni; } + // (listToAttrs (concatMap (svc: svc.globalEnvVars) allSubservices)); preStart = '' |