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

This commit is contained in:
Aaron Andersen 2020-01-08 10:37:46 -05:00
parent cca0c894a1
commit 336a6f471f
2 changed files with 4 additions and 0 deletions

View File

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

View File

@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
prePatch = ''
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|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
'';
# Required for pthread_cancel.