X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftools%2Fdav%2Fdefault.nix;h=fb0baaece9f034441871b8fbbee932ece46bb263;hb=4288c2f2431fb782b0d512b1b3749187f2374b6a;hp=78e0ba3b8280d39b262fa0ad810d56c54e115c70;hpb=f40f5b235b890f46770a22f005f8a0f664cf0562;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
similarity index 78%
rename from nixops/modules/websites/tools/dav/default.nix
rename to modules/private/websites/tools/dav/default.nix
index 78e0ba3..fb0baae 100644
--- a/nixops/modules/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -20,13 +20,14 @@ let
       inherit (pkgs.webapps) davical awl;
     };
 
-    cfg = config.services.myWebsites.tools.dav;
+    cfg = config.myServices.websites.tools.dav;
 in {
-  options.services.myWebsites.tools.dav = {
+  options.myServices.websites.tools.dav = {
     enable = lib.mkEnableOption "enable dav website";
   };
 
   config = lib.mkIf cfg.enable {
+    system.activationScripts.davical = davical.activationScript;
     secrets.keys = davical.keys;
     services.websites.tools.modules = davical.apache.modules;
 
@@ -45,11 +46,8 @@ 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}
-      '';
+    myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
+    myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
   };
 }