Use pools instead of deprecated poolConfigs for php

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

diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index ea0a27fc7079f587647bceb3efa160fafc7b7997..bb3604231e399d5f321ee41936e2c3808eee4e7f 100644 (file)
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -1,8 +1,8 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
   roundcubemail = pkgs.callPackage ./roundcubemail.nix {
     inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
-    env = myconfig.env.tools.roundcubemail;
+    env = config.myEnv.tools.roundcubemail;
   };
   rainloop = pkgs.callPackage ./rainloop.nix {};
   cfg = config.myServices.websites.tools.email;
@@ -17,6 +17,10 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
+    services.duplyBackup.profiles.mail.excludeFile = ''
+      + ${rainloop.varDir}
+      + ${roundcubemail.varDir}
+      '';
     secrets.keys = roundcubemail.keys;
 
     services.websites.env.tools.modules =
@@ -56,8 +60,9 @@ in
       extraConfig = roundcubemail.phpFpm.pool;
       phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
     };
-    services.phpfpm.poolConfigs = {
-      rainloop = rainloop.phpFpm.pool;
+    services.phpfpm.pools.rainloop = {
+      listen = rainloop.phpFpm.socket;
+      extraConfig = rainloop.phpFpm.pool;
     };
     system.activationScripts = {
       roundcubemail = roundcubemail.activationScript;