Move tools websites to stable web directories

2 files changed, 9 insertions, 3 deletions

diff --git a/nixops/modules/websites/tools/cloud/default.nix b/nixops/modules/websites/tools/cloud/default.nix
index f014776..360d52c 100644
--- a/nixops/modules/websites/tools/cloud/default.nix
+++ b/nixops/modules/websites/tools/cloud/default.nix
@@ -18,7 +18,7 @@ in {
     services.myWebsites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
       hosts       = ["cloud.immae.eu" ];
-      root        = nextcloud.webRoot;
+      root        = nextcloud.apache.root;
       extraConfig = [
         nextcloud.apache.vhostConf
       ];
@@ -37,6 +37,10 @@ in {
     in [ occ ];
 
     system.activationScripts.nextcloud = nextcloud.activationScript;
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${nextcloud.webRoot} $out/webapps/${nextcloud.apache.webappName}
+      '';
 
     services.myPhpfpm = {
       poolPhpConfigs.nextcloud = nextcloud.phpFpm.phpConfig;
diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix
index ac77920..d9e0be0 100644
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -214,13 +214,15 @@ let
         fi
       '';
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_nextcloud";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
         SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-        <Directory ${webRoot}>
+        <Directory ${root}>
           AcceptPathInfo On
           DirectoryIndex index.php
           Options FollowSymlinks