Adjust load warnings for monitoring

[perso/Immae/Config/Nix.git] / modules / websites / httpd-service-builder.nix

diff --git a/modules/websites/httpd-service-builder.nix b/modules/websites/httpd-service-builder.nix
index ec79a90c0f0dbd583d06af8bdc8b75744c91cf9d..1f7488dc63de57afcadc5ebc02aecbb8ee402882 100644 (file)
--- 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";