Merge pull request #99251 from xfix/remove-unnecessary-sendmail-configuration
nixos/httpd: remove unnecessary sendmail configuration
This commit is contained in:
commit
dedd67610a
2 changed files with 2 additions and 8 deletions
|
@ -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) ''
|
||||
|
|
|
@ -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, ... }:
|
||||
|
|
Loading…
Reference in a new issue