diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-01-15 21:02:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 21:02:05 -0500 |
| commit | 7260d2eb1332b04da3db2a6093868a27bfa6ee83 (patch) | |
| tree | fa204dc9ef0522b542ad52b6f88dc58f092467cb | |
| parent | 588e1c61cbe6cce42b8c2c9025696df50c0472f3 (diff) | |
| parent | 336a6f471f1e40d4a440b4176c2a1b8db65fe007 (diff) | |
| download | nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar.gz nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar.bz2 nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar.lz nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar.xz nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.tar.zst nixpkgs-7260d2eb1332b04da3db2a6093868a27bfa6ee83.zip | |
Merge pull request #77326 from aanderse/apacheHttpd
nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 4460f89ec5c..fd17e4b54f0 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -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. diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index d5da6df8d68..252365098dd 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -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’. |