public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99251 from xfix/remove-unnecessary-sendmail-configuration

Browse Source 
nixos/httpd: remove unnecessary sendmail configuration
This commit is contained in:
Aaron Andersen 2020-10-05 08:59:42 -04:00 committed by GitHub
commit dedd67610a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -693,9 +693,6 @@ in
services.httpd.phpOptions = services.httpd.phpOptions =
'' ''
; Needed for PHP's mail() function.
sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i
; Don't advertise PHP ; Don't advertise PHP
expose_php = off expose_php = off
'' + optionalString (config.time.timeZone != null) '' '' + optionalString (config.time.timeZone != null) ''

7
nixos/modules/services/web-servers/phpfpm/default.nix
View File

@ -26,12 +26,9 @@ let
phpIni = poolOpts: pkgs.runCommand "php.ini" { phpIni = poolOpts: pkgs.runCommand "php.ini" {
inherit (poolOpts) phpPackage phpOptions; inherit (poolOpts) phpPackage phpOptions;
preferLocalBuild = true; preferLocalBuild = true;
nixDefaults = '' passAsFile = [ "phpOptions" ];
sendmail_path = "/run/wrappers/bin/sendmail -t -i"
'';
passAsFile = [ "nixDefaults" "phpOptions" ];
} '' } ''
cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out cat ${poolOpts.phpPackage}/etc/php.ini $phpOptionsPath > $out
''; '';
poolOpts = { name, ... }: poolOpts = { name, ... }: