X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;h=075cf48d440a4f906d46f17e3064f2ab744d90d1;hb=7df420c27ebe7daaa4fd099c457ce9a9075b840e;hp=56b3006edad0449079b6d92f0d5263a222852957;hpb=60dbbd12253f2f7b6994fea1c56fdf3818d0a025;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix
index 56b3006..075cf48 100644
--- a/nixops/modules/websites/tools/dav/default.nix
+++ b/nixops/modules/websites/tools/dav/default.nix
@@ -1,8 +1,23 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
-    infcloud = pkgs.callPackage ./infcloud.nix {};
+    infcloud = rec {
+      webappName = "tools_infcloud";
+      root = "/run/current-system/webapps/${webappName}";
+      vhostConf = ''
+          Alias /carddavmate ${root}
+          Alias /caldavzap ${root}
+          Alias /infcloud ${root}
+          <Directory ${root}>
+            AllowOverride All
+            Options FollowSymlinks
+            Require all granted
+            DirectoryIndex index.html
+          </Directory>
+      '';
+    };
     davical = pkgs.callPackage ./davical.nix {
       env = myconfig.env.tools.davical;
+      inherit (pkgs.webapps) davical awl;
     };
 
     cfg = config.services.myWebsites.tools.dav;
@@ -12,17 +27,16 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null;
-
-    deployment.keys = davical.keys;
-    services.myWebsites.tools.modules = davical.apache.modules;
+    secrets.keys = davical.keys;
+    services.websites.tools.modules = davical.apache.modules;
 
-    services.myWebsites.tools.vhostConfs.dav = {
+    services.websites.tools.vhostConfs.dav = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["dav.immae.eu" ];
       root        = null;
       extraConfig = [
-        infcloud.apache.vhostConf
+        infcloud.vhostConf
         davical.apache.vhostConf
       ];
     };
@@ -34,7 +48,7 @@ in {
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${davical.webRoot} $out/webapps/${davical.apache.webappName}
-      ln -s ${infcloud.webRoot} $out/webapps/${infcloud.apache.webappName}
+      ln -s ${pkgs.webapps.infcloud} $out/webapps/${infcloud.webappName}
       '';
   };
 }