Add certificate creation and handling to websites

[perso/Immae/Config/Nix.git] / nixops / modules / websites / ftp / denisejerome.nix

diff --git a/nixops/modules/websites/ftp/denisejerome.nix b/nixops/modules/websites/ftp/denisejerome.nix
index 2958d87038c8a3d952fae7a524f72fb1aa1a1fad..884fb62d5f8867a520523af1597ba52759960e67 100644 (file)
--- a/nixops/modules/websites/ftp/denisejerome.nix
+++ b/nixops/modules/websites/ftp/denisejerome.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.DeniseJerome;
     varDir = "/var/lib/ftp/denisejerome";
@@ -10,28 +10,15 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkIf cfg.production.enable {
-    services.myWebsites.commons.stats.enable = true;
-    services.myWebsites.commons.stats.sites = [
-      {
-        name = "denisejerome.piedsjaloux.fr";
-        conf = ./denisejerome_goaccess.conf;
-      }
-    ];
-
-    security.acme.certs."denisejerome" = config.services.myCertificates.certConfig // {
-      domain = "denisejerome.piedsjaloux.fr";
-    };
+    services.webstats.sites = [ { name = "denisejerome.piedsjaloux.fr"; } ];
 
-    services.myWebsites.production.vhostConfs.denisejerome = {
-      certName    = "denisejerome";
-      hosts       = ["denisejerome.piedsjaloux.fr" ];
-      root        = varDir;
-      extraConfig = [
+    services.websites.production.vhostConfs.denisejerome = {
+      certName     = "denisejerome";
+      certMainHost = "denisejerome.piedsjaloux.fr";
+      hosts        = ["denisejerome.piedsjaloux.fr" ];
+      root         = varDir;
+      extraConfig  = [
         ''
         Use Stats denisejerome.piedsjaloux.fr