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

Revert "nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command" 

This reverts commit 336a6f471f.
This commit is contained in:
Aaron Andersen 2020-02-02 08:08:02 -05:00
parent 0c960262d1
commit e23ba2a1b0
2 changed files with 0 additions and 4 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

@ -643,9 +643,6 @@ in
environment.systemPackages = [ pkg ]; environment.systemPackages = [ pkg ];
# required for "apachectl configtest"
environment.etc."httpd/httpd.conf".source = httpdConf;
services.httpd.phpOptions = services.httpd.phpOptions =
'' ''
; Needed for PHP's mail() function. ; Needed for PHP's mail() function.

1
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
sed -i support/apachectl.in -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
''; '';
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.