X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fwebsites%2Fhttpd-service-builder.nix;h=1f7488dc63de57afcadc5ebc02aecbb8ee402882;hb=7ad4966f41db0669a77c7a6ee7f87f0d4e586b0c;hp=ec79a90c0f0dbd583d06af8bdc8b75744c91cf9d;hpb=e7b890d0999fe54a99f84fe92d625d9d488358dc;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/websites/httpd-service-builder.nix b/modules/websites/httpd-service-builder.nix
index ec79a90..1f7488d 100644
--- a/modules/websites/httpd-service-builder.nix
+++ b/modules/websites/httpd-service-builder.nix
@@ -167,7 +167,6 @@ let
             SSLEngine on
             SSLCertificateFile ${sslServerCert}
             SSLCertificateKeyFile ${sslServerKey}
-            ${optionalString (sslServerChain != null) "SSLCertificateChainFile ${sslServerChain}"}
             ${optionalString hostOpts.http2 "Protocols h2 h2c http/1.1"}
             ${acmeChallenge}
             ${mkVHostCommonConf hostOpts}
@@ -470,7 +469,7 @@ in
       };
 
       virtualHosts = mkOption {
-        type = with types; attrsOf (submodule (import ./vhost-options.nix));
+        type = with types; attrsOf (submodule (import <nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix>));
         default = {
           localhost = {
             documentRoot = "${pkg}/htdocs";