X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fludivine%2Fdefault.nix;h=70d5199f28d92cf700be1d2924e2129d12ad03c6;hp=dfeff0ad6542646ed8860a959a9c68e712dffe69;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hpb=52f45eb051df228955add90ca62de66a7ed8af34

diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index dfeff0a..70d5199 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -25,13 +25,6 @@ in {
       secrets.keys = ludivinecassal_prod.keys;
       services.webstats.sites = [ { name = "ludivinecassal.com"; } ];
 
-      security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // {
-        domain = "ludivinecassal.com";
-        extraDomains = {
-          "www.ludivinecassal.com" = null;
-        };
-      };
-
       services.myPhpfpm.preStart.ludivinecassal_prod = ludivinecassal_prod.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
@@ -42,15 +35,15 @@ in {
         '';
       services.websites.production.modules = ludivinecassal_prod.apache.modules;
       services.websites.production.vhostConfs.ludivine = {
-        certName    = "ludivinecassal";
-        hosts       = ["ludivinecassal.com" "www.ludivinecassal.com" ];
-        root        = ludivinecassal_prod.apache.root;
-        extraConfig = [ ludivinecassal_prod.apache.vhostConf ];
+        certName     = "ludivinecassal";
+        certMainHost = "ludivinecassal.com";
+        hosts        = ["ludivinecassal.com" "www.ludivinecassal.com" ];
+        root         = ludivinecassal_prod.apache.root;
+        extraConfig  = [ ludivinecassal_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
       secrets.keys = ludivinecassal_dev.keys;
-      security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
 
       services.myPhpfpm.preStart.ludivinecassal_dev = ludivinecassal_dev.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps;
@@ -63,6 +56,7 @@ in {
       services.websites.integration.modules = ludivinecassal_dev.apache.modules;
       services.websites.integration.vhostConfs.ludivine = {
         certName    = "eldiron";
+        addToCerts  = true;
         hosts       = [ "ludivine.immae.eu" ];
         root        = ludivinecassal_dev.apache.root;
         extraConfig = [ ludivinecassal_dev.apache.vhostConf ];