X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fmail%2Fdefault.nix;h=217ef1ab415e8de84c7a7e0a54c1836af51df5ef;hb=dcac3ec730176549cd52a9a42db2001dc652c30d;hp=1f7f7bfe9fe2a787acdf8f63ea2385404f20aa4d;hpb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 1f7f7bf..217ef1a 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -4,7 +4,9 @@ let
     inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
     env = config.myEnv.tools.roundcubemail;
   };
-  rainloop = pkgs.callPackage ./rainloop.nix {};
+  rainloop = pkgs.callPackage ./rainloop.nix {
+    rainloop = pkgs.rainloop-community;
+  };
   cfg = config.myServices.websites.tools.email;
   pcfg = config.services.phpfpm.pools;
 in
@@ -60,19 +62,24 @@ in
       user = "wwwrun";
       group = "wwwrun";
       settings = roundcubemail.phpFpm.pool;
-      phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
+      phpOptions = config.services.phpfpm.phpOptions + ''
+        date.timezone = 'CET'
+        extension=${pkgs.php72Packages.imagick}/lib/php/extensions/imagick.so
+      '';
+      phpPackage = pkgs.php72;
     };
     services.phpfpm.pools.rainloop = {
       user = "wwwrun";
       group = "wwwrun";
       settings = rainloop.phpFpm.pool;
+      phpPackage = pkgs.php72;
     };
     system.activationScripts = {
       roundcubemail = roundcubemail.activationScript;
       rainloop = rainloop.activationScript;
     };
 
-    myServices.websites.webappDirs = {
+    services.websites.webappDirs = {
       _mail = ./www;
       "${roundcubemail.apache.webappName}" = roundcubemail.webRoot;
       "${rainloop.apache.webappName}" = rainloop.webRoot;