diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-04-11 20:06:24 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2020-04-21 20:33:18 -0400 |
| commit | d0de9702795d33d6c3c72ea663256b9a743435e1 (patch) | |
| tree | 4fc04d9a011fd51f8e8b7abf1f4fd4f1f4bc02a1 /nixos/modules/services/web-servers | |
| parent | ee030b121b3e963c753968f34678a89c4f2f006c (diff) | |
| download | nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar.gz nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar.bz2 nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar.lz nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar.xz nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.tar.zst nixlib-d0de9702795d33d6c3c72ea663256b9a743435e1.zip | |
nixos/httpd: some mod_php cleanup
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 0ab7942e46b5..6f37974fde1b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -657,7 +657,7 @@ in services.httpd.phpOptions = '' ; Needed for PHP's mail() function. - sendmail_path = sendmail -t -i + sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i ; Don't advertise PHP expose_php = off @@ -708,9 +708,7 @@ in wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME); after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; - path = - [ pkg pkgs.coreutils pkgs.gnugrep ] - ++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. + path = [ pkg pkgs.coreutils pkgs.gnugrep ]; environment = optionalAttrs cfg.enablePHP { PHPRC = phpIni; } |