Move websites/tools to modules

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / dav / default.nix

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 78e0ba3b8280d39b262fa0ad810d56c54e115c70..fb0baaece9f034441871b8fbbee932ece46bb263 100644 (file)
--- 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;
   };
 }