Remove useless relative symlinks

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

diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index 9f3779f56e68c2aaa5e76601adf138f37146e401..0f6b4605de1d595d8d3d9f6acb8b0a4d45ad1aac 100644 (file)
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -17,7 +17,7 @@ let
 
     installPhase = ''
       rm -r {cache,pagecache,tmp,data}/
-      ln -sf ../../../..${varDir}/{cache,pagecache,tmp,data} .
+      ln -sf ${varDir}/{cache,pagecache,tmp,data} .
       mkdir -p $doc/share/doc
       mv doc/ $doc/share/doc/shaarli
       mkdir $out/
@@ -40,14 +40,16 @@ in rec {
       ${varDir}/phpSessions
     '';
   webRoot = shaarli;
-  apache = {
+  apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
+    webappName = "tools_shaarli";
+    root = "/run/current-system/webapps/${webappName}";
     vhostConf = ''
-      Alias /Shaarli "${webRoot}"
+      Alias /Shaarli "${root}"
 
-      <Directory "${webRoot}">
+      <Directory "${root}">
         SetEnv SHAARLI_LDAP_PASSWORD "${env.ldap.password}"
         SetEnv SHAARLI_LDAP_DN       "${env.ldap.dn}"
         SetEnv SHAARLI_LDAP_HOST     "ldaps://${env.ldap.host}"