X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;h=ea2105b495ffca6391080830657d6670380c50e1;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=ef9735e4f40b87d1ff1f113bbe6b6c7458186cf2;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;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 ef9735e..ea2105b 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;
@@ -14,14 +29,15 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."dav.immae.eu" = null;
 
-    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";
       hosts       = ["dav.immae.eu" ];
       root        = null;
       extraConfig = [
-        infcloud.apache.vhostConf
+        infcloud.vhostConf
         davical.apache.vhostConf
       ];
     };
@@ -30,6 +46,11 @@ in {
       davical = davical.phpFpm.pool;
     };
 
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${davical.webRoot} $out/webapps/${davical.apache.webappName}
+      ln -s ${pkgs.webapps.infcloud} $out/webapps/${infcloud.webappName}
+      '';
   };
 }