Remove useless relative symlinks

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / cloud / nextcloud.nix

diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix
index ac77920a7afcde1880fa0d2c2125be2ba62a4ef0..2e528283a38004e881615257000f0f591def84f8 100644 (file)
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -188,7 +188,7 @@ let
         mkdir -p $out/
         cp -R . $out/
         rm -r $out/config
-        ln -sf ../../../../../${varDir}/config $out/config
+        ln -sf ${varDir}/config $out/config
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps
         )}
@@ -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