From 05eb3496e6d0995cc5ee65d8e4bd40eed30db21e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Thu, 1 Oct 2020 12:05:08 +0200 Subject: [PATCH 1/2] nixos/httpd: remove unnecessary sendmail configuration PHP now uses system-sendmail without special configuration. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 3 --- 1 file changed, 3 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) '' From 6fc06a1d3d789eea00cadc17373ebae992e53867 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 2 Oct 2020 09:11:14 +0200 Subject: [PATCH 2/2] nixos/phpfpm: remove unnecessary sendmail configuration --- nixos/modules/services/web-servers/phpfpm/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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, ... }: