X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fkanboard.nix;h=54bbe017738ec275da3dbbb4bcf8551a396ba134;hb=750fe5a43b957b91a26069cf8a4fe19fc7b2633c;hp=1a7049930c2f634c570ff38985410f77a29fbf68;hpb=da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index 1a70499..54bbe01 100644
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -13,8 +13,7 @@ rec {
       install -TDm644 ${webRoot}/dataold/web.config ${varDir}/data/web.config
     '';
   };
-  keys = [{
-    dest = "webapps/tools-kanboard";
+  keys."webapps/tools-kanboard" = {
     user = apache.user;
     group = apache.group;
     permissions = "0400";
@@ -41,14 +40,13 @@ rec {
       define('LDAP_GROUP_ADMIN_DN', '${env.ldap.admin_dn}');
       ?>
       '';
-  }];
+  };
   webRoot = kanboard { kanboard_config = config.secrets.fullPaths."webapps/tools-kanboard"; };
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_kanboard";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
     Alias /kanboard "${root}"
     <Directory "${root}">