Add certificate creation and handling to websites

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / cloud.nix

diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index a7fcd6149a086aea15b91e122bca1012f315719d..5e010f4332cb9aac9859d26d15dbe30edf4afed5 100644 (file)
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps);
   env = myconfig.env.tools.nextcloud;
@@ -49,12 +49,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."cloud.immae.eu" = null;
+    services.websites.tools.modules = [ "proxy_fcgi" ];
 
-    services.myWebsites.tools.modules = [ "proxy_fcgi" ];
-
-    services.myWebsites.tools.vhostConfs.cloud = {
+    services.websites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["cloud.immae.eu" ];
       root        = apacheRoot;
       extraConfig = [
@@ -80,7 +79,7 @@ in {
       ];
     };
 
-    mySecrets.keys = [{
+    secrets.keys = [{
       dest = "webapps/tools-nextcloud";
       user = "wwwrun";
       group = "wwwrun";