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/mail/default.nix       | 11 ++---------
 modules/private/websites/tools/mail/mta-sts.nix       |  8 ++------
 modules/private/websites/tools/mail/rainloop.nix      |  3 +--
 modules/private/websites/tools/mail/roundcubemail.nix |  3 +--
 4 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'modules/private/websites/tools/mail')

diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 033a587..7bc3d2d 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -36,12 +36,12 @@ in
       certName   = "mail";
       addToCerts = true;
       hosts      = ["mail.immae.eu"];
-      root       = "/run/current-system/webapps/_mail";
+      root       = ./www;
       extraConfig = [
         (rainloop.apache.vhostConf pcfg.rainloop.socket)
         (roundcubemail.apache.vhostConf pcfg.roundcubemail.socket)
         ''
-          <Directory /run/current-system/webapps/_mail>
+          <Directory ${./www}>
             Require all granted
             Options -Indexes
           </Directory>
@@ -78,13 +78,6 @@ in
       roundcubemail = roundcubemail.activationScript;
       rainloop = rainloop.activationScript;
     };
-
-    services.websites.webappDirs = {
-      _mail = ./www;
-      "${roundcubemail.apache.webappName}" = roundcubemail.webRoot;
-      "${rainloop.apache.webappName}" = rainloop.webRoot;
-    };
-
   };
 
 }
diff --git a/modules/private/websites/tools/mail/mta-sts.nix b/modules/private/websites/tools/mail/mta-sts.nix
index c5f71f0..77ba2d4 100644
--- a/modules/private/websites/tools/mail/mta-sts.nix
+++ b/modules/private/websites/tools/mail/mta-sts.nix
@@ -33,21 +33,17 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    services.websites.webappDirs = {
-      _mta-sts = root;
-    };
-
     services.websites.env.tools.vhostConfs.mta_sts = {
       certName   = "mail";
       addToCerts = true;
       hosts = ["mta-sts.mail.immae.eu"] ++ map (v: "mta-sts.${v.domain}") domains;
-      root = "/run/current-system/webapps/_mta-sts";
+      root = root;
       extraConfig = [
         ''
           RewriteEngine on
           RewriteCond %{HTTP_HOST} ^mta-sts.(.*)$
           RewriteRule ^/.well-known/mta-sts.txt$ %{DOCUMENT_ROOT}/%1.txt [L]
-          <Directory /run/current-system/webapps/_mta-sts>
+          <Directory ${root}>
             Require all granted
             Options -Indexes
           </Directory>
diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix
index 21de5eb..20e43a1 100644
--- a/modules/private/websites/tools/mail/rainloop.nix
+++ b/modules/private/websites/tools/mail/rainloop.nix
@@ -14,8 +14,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_rainloop";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
     Alias /rainloop "${root}"
     <Directory "${root}">
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix
index 92de28e..2661b55 100644
--- a/modules/private/websites/tools/mail/roundcubemail.nix
+++ b/modules/private/websites/tools/mail/roundcubemail.nix
@@ -79,8 +79,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_roundcubemail";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
     Alias /roundcube "${root}"
     <Directory "${root}">
-- 
cgit v1.2.3