Add certificate creation and handling to websites

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

diff --git a/nixops/modules/websites/ftp/release.nix b/nixops/modules/websites/ftp/release.nix
index 78ee2767a1be669b62568fb6618c7cc3776b600a..db3487f425d9732f21a6219aadf1142fcfd2f73a 100644 (file)
--- a/nixops/modules/websites/ftp/release.nix
+++ b/nixops/modules/websites/ftp/release.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Release;
     varDir = "/var/lib/ftp/release.immae.eu";
@@ -10,23 +10,12 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkIf cfg.production.enable {
-    services.myWebsites.commons.stats.enable = true;
-    services.myWebsites.commons.stats.sites = [
-      {
-        name = "release.immae.eu";
-        conf = ./release_goaccess.conf;
-      }
-    ];
-
-    security.acme.certs."eldiron".extraDomains."release.immae.eu" = null;
+    services.webstats.sites = [ { name = "release.immae.eu"; } ];
 
-    services.myWebsites.production.vhostConfs.release = {
+    services.websites.production.vhostConfs.release = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = [ "release.immae.eu" ];
       root        = varDir;
       extraConfig = [