Revert "nixos/httpd: symlink apache configuration to /etc/httpd/httpd…

….conf for use in the apachectl command" This reverts commit 336a6f4.
NixOS · Feb 2, 2020 · e23ba2a · e23ba2a
1 parent 0c96026
commit e23ba2a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -643,9 +643,6 @@ in
 
     environment.systemPackages = [ pkg ];
 
-    # 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
@@ -39,7 +39,6 @@ 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’.