X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fshaarli.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fshaarli.nix;h=a43d677c9c4ab39bbff274164777761b977c8e52;hb=a95ab089420d6edf24f22500dabf7876d329dc91;hp=9f3779f56e68c2aaa5e76601adf138f37146e401;hpb=7da3ceece7fe6c49046e97f37fc353db9b8a981c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index 9f3779f..a43d677 100644
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -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}"