WIP upgrade

[perso/Immae/Config/Nix.git] / modules / websites / default.nix

diff --git a/modules/websites/default.nix b/modules/websites/default.nix
index 6658c6624f4470aee16c4d40cac77437a68b0f5a..f6ee059362101dd1b7b62ec0c37cb33f9064d801 100644 (file)
--- a/modules/websites/default.nix
+++ b/modules/websites/default.nix
@@ -149,6 +149,7 @@ in
         '';
     };
     toVhost = ips: vhostConf: {
+      acmeRoot = "/var/lib/acme/acme-challenges";
       forceSSL = vhostConf.forceSSL or true;
       useACMEHost = vhostConf.certName;
       logFormat = "combinedVhost";
@@ -232,12 +233,10 @@ in
     if (!isNull (groupToDomain g))
     then cfg.certs // {
       domain = groupToDomain g;
-      extraDomains = builtins.listToAttrs (
-        map (d: attrsets.nameValuePair d null) (extraDomains g));
+      extraDomainNames = extraDomains g;
     }
     else {
-      extraDomains = builtins.listToAttrs (
-        map (d: attrsets.nameValuePair d null) (extraDomains g));
+      extraDomainNames = extraDomains g;
     }
   ) groupedCerts;