diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-10-05 08:59:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 08:59:42 -0400 |
| commit | dedd67610abaf200798e445bdc8356bfbac7ebd6 (patch) | |
| tree | 6e6f5cf4db5d7c83aaf0a67d2b493672f366c2ba /nixos/modules/services/web-servers | |
| parent | 90b11e666d7ee4e669e7863c484f8851e7cb1f20 (diff) | |
| parent | 6fc06a1d3d789eea00cadc17373ebae992e53867 (diff) | |
| download | nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar.gz nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar.bz2 nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar.lz nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar.xz nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.tar.zst nixpkgs-dedd67610abaf200798e445bdc8356bfbac7ebd6.zip | |
Merge pull request #99251 from xfix/remove-unnecessary-sendmail-configuration
nixos/httpd: remove unnecessary sendmail configuration
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/phpfpm/default.nix | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6dd1c85132c..6ffda3d6361 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -693,9 +693,6 @@ in services.httpd.phpOptions = '' - ; Needed for PHP's mail() function. - sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i - ; Don't advertise PHP expose_php = off '' + optionalString (config.time.timeZone != null) '' diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 759eebf768d..4d302299f5f 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -26,12 +26,9 @@ let phpIni = poolOpts: pkgs.runCommand "php.ini" { inherit (poolOpts) phpPackage phpOptions; preferLocalBuild = true; - nixDefaults = '' - sendmail_path = "/run/wrappers/bin/sendmail -t -i" - ''; - passAsFile = [ "nixDefaults" "phpOptions" ]; + passAsFile = [ "phpOptions" ]; } '' - cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out + cat ${poolOpts.phpPackage}/etc/php.ini $phpOptionsPath > $out ''; poolOpts = { name, ... }: |