X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Femilia%2Fdefault.nix;h=47257b7a2f1e668b74db880a71341f08211cedfb;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hp=97173b924f483ed4b369144e2ffcaa7028c8dfb3;hpb=8a964143a4173fcbd6f398fffee727f228f952fa;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/emilia/default.nix b/nixops/modules/websites/emilia/default.nix
index 97173b9..47257b7 100644
--- a/nixops/modules/websites/emilia/default.nix
+++ b/nixops/modules/websites/emilia/default.nix
@@ -47,13 +47,6 @@ in {
   };
 
   config = lib.mkIf cfg.production.enable {
-    security.acme.certs."emilia" = config.services.myCertificates.certConfig // {
-      domain = "saison-photo.org";
-      extraDomains = {
-        "www.saison-photo.org" = null;
-      };
-    };
-
     system.activationScripts.emilia = ''
       install -m 0755 -o wwwrun -g wwwrun -d ${varDir}
       '';
@@ -61,11 +54,12 @@ in {
       mkdir -p $out/webapps
       ln -s ${siteDir} $out/webapps/${webappName}
       '';
-    services.myWebsites.production.vhostConfs.emilia = {
-      certName    = "emilia";
-      hosts       = [ "saison-photo.org" "www.saison-photo.org" ];
-      root        = root;
-      extraConfig = [
+    services.websites.production.vhostConfs.emilia = {
+      certName     = "emilia";
+      certMainHost = "saison-photo.org";
+      hosts        = [ "saison-photo.org" "www.saison-photo.org" ];
+      root         = root;
+      extraConfig  = [
         ''
         <Directory ${root}>
           DirectoryIndex pause.html