Remove webappdirs

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / mail / rainloop.nix

diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix
index 9b1f0c5133d850c06eec4c5890d708cacb9ab602..20e43a17b3286770173abb71f7a9f358bb3fe117 100644 (file)
--- a/modules/private/websites/tools/mail/rainloop.nix
+++ b/modules/private/websites/tools/mail/rainloop.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, writeText, stdenv, fetchurl }:
+{ lib, rainloop, writeText, stdenv, fetchurl }:
 rec {
   varDir = "/var/lib/rainloop";
   activationScript = {
@@ -9,13 +9,12 @@ rec {
       install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/data
     '';
   };
-  webRoot = pkgs.rainloop-community.override { dataPath = "${varDir}/data"; };
+  webRoot = rainloop.override { dataPath = "${varDir}/data"; };
   apache = 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}">