From 750fe5a43b957b91a26069cf8a4fe19fc7b2633c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 22 Oct 2021 20:07:14 +0200
Subject: Remove webappdirs

---
 modules/private/websites/tools/diaspora/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'modules/private/websites/tools/diaspora/default.nix')

diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix
index 9119ead..9afd5b9 100644
--- a/modules/private/websites/tools/diaspora/default.nix
+++ b/modules/private/websites/tools/diaspora/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, config,  ... }:
 let
   env = config.myEnv.tools.diaspora;
-  root = "/run/current-system/webapps/tools_diaspora";
+  root = "${dcfg.workdir}/public/";
   cfg = config.myServices.websites.tools.diaspora;
   dcfg = config.services.diaspora;
 in {
@@ -160,10 +160,6 @@ in {
     services.websites.env.tools.modules = [
       "headers" "proxy" "proxy_http"
     ];
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora
-      '';
     services.websites.env.tools.vhostConfs.diaspora = {
       certName    = "eldiron";
       addToCerts  = true;
-- 
cgit v1.2.3