X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fflorian.nix;h=ebd461e4e95c8957afc68fc8ff4f484dedd77385;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hp=9688700a6ca55dabc28908a50c00a87ef5e89c3e;hpb=79f239be693bb2bad9e1cc64a32e874d96cc4cf7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ftp/florian.nix b/nixops/modules/websites/ftp/florian.nix
index 9688700..ebd461e 100644
--- a/nixops/modules/websites/ftp/florian.nix
+++ b/nixops/modules/websites/ftp/florian.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
     cfg = config.services.myWebsites.Florian;
@@ -17,19 +17,14 @@ in {
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
       security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
-      security.acme.certs."florian" = config.services.myCertificates.certConfig // {
-        domain = "tellesflorian.com";
-        extraDomains = {
-          "www.tellesflorian.com" = null;
-        };
-      };
 
-      services.myWebsites.production.modules = adminer.apache.modules;
-      services.myWebsites.production.vhostConfs.florian = {
-        certName    = "florian";
-        hosts       = [ "tellesflorian.com" "www.tellesflorian.com" ];
-        root        = "${varDir}/tellesflorian.com";
-        extraConfig = [
+      services.websites.production.modules = adminer.apache.modules;
+      services.websites.production.vhostConfs.florian = {
+        certName     = "florian";
+        certMainHost = "tellesflorian.com";
+        hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
+        root         = "${varDir}/tellesflorian.com";
+        extraConfig  = [
           adminer.apache.vhostConf
           ''
           ServerAdmin ${env.server_admin}
@@ -47,11 +42,11 @@ in {
 
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
-      security.acme.certs."eldiron".extraDomains."florian.immae.eu" = null;
 
-      services.myWebsites.integration.modules = adminer.apache.modules;
-      services.myWebsites.integration.vhostConfs.florian = {
+      services.websites.integration.modules = adminer.apache.modules;
+      services.websites.integration.vhostConfs.florian = {
         certName    = "eldiron";
+        addToCerts  = true;
         hosts       = [ "florian.immae.eu" ];
         root        = "${varDir}/florian.immae.eu";
         extraConfig = [