Remove useless relative symlinks

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

diff --git a/nixops/modules/websites/tools/tools/dokuwiki.nix b/nixops/modules/websites/tools/tools/dokuwiki.nix
index 5affddb06b1cda709692aefc845527b15b9b62ae..2f4e8c11e0cc7d56844f31f38c88f446b0d9911f 100644 (file)
--- a/nixops/modules/websites/tools/tools/dokuwiki.nix
+++ b/nixops/modules/websites/tools/tools/dokuwiki.nix
@@ -48,20 +48,22 @@ let
       installPhase = ''
         cp -a . $out
         cp ${preload} $out/inc/preload.php
-        ln -sf ../../../../../${varDir}/{conf,data} $out/
-        ln -sf ../../../../../${varDir}/conf/.htaccess $out/
+        ln -sf ${varDir}/{conf,data} $out/
+        ln -sf ${varDir}/conf/.htaccess $out/
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/lib/plugins/${name}") plugins
         )}
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_dokuwiki";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /dokuwiki "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /dokuwiki "${root}"
+        <Directory "${root}">
           DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"