Bump roundcube

3 files changed, 21 insertions, 14 deletions

diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 9d6c296..ce35075 100644
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -813,7 +813,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
+        "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -830,7 +830,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
+        "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -847,7 +847,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
+        "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -864,7 +864,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
+        "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -2153,7 +2153,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=",
+        "narHash": "sha256-Mz6LcYYOO+Le7QLMF0DgHQhxsW2rwlVlOPjQ7qVMPkA=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -2206,7 +2206,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=",
+        "narHash": "sha256-CAHlCHER4gZyTBFePdnwe1Nc4vou7kX32CCswH7R8UE=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -2248,7 +2248,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=",
+        "narHash": "sha256-vac+qxaNDCm32tPdRs7P8tk1aSAdSMiu5bUBV8qMkjA=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -2329,7 +2329,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=",
+        "narHash": "sha256-aOCmHpzzQ3yXa5YrMr54luIYwZAj6Kd4io8r84vzRlo=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -2440,7 +2440,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=",
+        "narHash": "sha256-qslNggHZT+PwW8BuwH4I6SXetJuqwPyu/pIQzfzPJ54=",
         "path": "../../flakes/surfer",
         "type": "path"
       },
diff --git a/systems/eldiron/websites/mail/default.nix b/systems/eldiron/websites/mail/default.nix
index 0a0342b..e212cd2 100644
--- a/systems/eldiron/websites/mail/default.nix
+++ b/systems/eldiron/websites/mail/default.nix
@@ -111,13 +111,13 @@ in
       phpOptions = config.services.phpfpm.phpOptions + ''
         date.timezone = 'CET'
       '';
-      phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick all.redis ]);
+      phpPackage = pkgs.php82.withExtensions({ enabled, all }: enabled ++ [ all.imagick all.redis ]);
     };
     services.phpfpm.pools.rainloop = {
       user = "wwwrun";
       group = "wwwrun";
       settings = rainloop.phpFpm.pool;
-      phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.redis ]);
+      phpPackage = pkgs.php82.withExtensions({ enabled, all }: enabled ++ [ all.redis ]);
     };
     system.activationScripts = {
       roundcubemail = roundcubemail.activationScript;
diff --git a/systems/eldiron/websites/mail/roundcubemail.nix b/systems/eldiron/websites/mail/roundcubemail.nix
index 21a10fe..1db6c81 100644
--- a/systems/eldiron/websites/mail/roundcubemail.nix
+++ b/systems/eldiron/websites/mail/roundcubemail.nix
@@ -15,15 +15,16 @@ rec {
     text =
       let
         psql_url = with env.postgresql; "pgsql://${user}:${password}@unix(${socket}:${port})/${database}";
+        mysql_postfix_url = with config.myEnv.mail.dovecot.mysql; "mysql://${user}:${password}@unix(${socket})/${database}";
       in ''
       <?php
         $config['db_dsnw'] = '${psql_url}';
-        $config['default_host'] = 'ssl://imap.immae.eu';
+        $config['imap_host'] = 'ssl://imap.immae.eu';
         $config['username_domain'] = array(
           "imap.immae.eu" => "mail.immae.eu"
         );
         $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false));
-        $config['smtp_server'] = 'tls://smtp.immae.eu';
+        $config['smtp_host'] = 'tls://smtp.immae.eu';
         $config['smtp_port'] = '587';
         $config['managesieve_host'] = 'imap.immae.eu';
         $config['managesieve_port'] = '4190';
@@ -49,16 +50,22 @@ rec {
           'markasjunk',
           'managesieve',
           'newmail_notifier',
+          'reconnect',
           'vcard_attachments',
           'zipdownload',
+          'virtuser_query',
 
-          'automatic_addressbook',
           'message_highlight',
           'carddav',
+          // Intégré à roundcube 'automatic_addressbook',
           // Ne marche pas ?: 'ident_switch',
           // Ne marche pas ?: 'thunderbird_labels',
         );
 
+        $config['virtuser_query_dsn'] = '${mysql_postfix_url}';
+        $config['virtuser_query'] = array(
+          "user" => "SELECT destination FROM forwardings WHERE ((regex = 1 AND '%m' REGEXP CONCAT('^',source,'$')) OR (regex = 0 AND source = '%m')) AND active = 1"
+        );
         $config['language'] = 'fr_FR';
 
         $config['drafts_mbox'] = 'Drafts';