Move tools websites to stable web directories

3 files changed, 18 insertions, 9 deletions

diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix
index 3f43607..6668fa1 100644
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -89,14 +89,16 @@ let
       buildInputs = [ gettext ];
     };
     webRoot = "${webapp}/htdocs";
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_davical";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /davical "${webRoot}"
-        Alias /caldav.php  "${webRoot}/caldav.php"
-        <Directory "${webRoot}">
+        Alias /davical "${root}"
+        Alias /caldav.php  "${root}/caldav.php"
+        <Directory "${root}">
           DirectoryIndex index.php index.html
           AcceptPathInfo On
           AllowOverride None
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix
index ef9735e..5b5d21e 100644
--- a/nixops/modules/websites/tools/dav/default.nix
+++ b/nixops/modules/websites/tools/dav/default.nix
@@ -30,6 +30,11 @@ in {
       davical = davical.phpFpm.pool;
     };
 
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${davical.webRoot} $out/webapps/${davical.apache.webappName}
+      ln -s ${infcloud.webRoot} $out/webapps/${infcloud.apache.webappName}
+      '';
   };
 }
 
diff --git a/nixops/modules/websites/tools/dav/infcloud.nix b/nixops/modules/websites/tools/dav/infcloud.nix
index 876578b..f1204ab 100644
--- a/nixops/modules/websites/tools/dav/infcloud.nix
+++ b/nixops/modules/websites/tools/dav/infcloud.nix
@@ -18,14 +18,16 @@ let
       '';
       buildInputs = [ ed ];
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
+      webappName = "tools_infcloud";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /carddavmate ${webRoot}
-        Alias /caldavzap ${webRoot}
-        Alias /infcloud ${webRoot}
-        <Directory ${webRoot}>
+        Alias /carddavmate ${root}
+        Alias /caldavzap ${root}
+        Alias /infcloud ${root}
+        <Directory ${root}>
           AllowOverride All
           Options FollowSymlinks
           Require all granted