X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Froundcubemail.nix;h=8bb60d639db2ef916769bdfb37953ecb93ec0245;hb=a929614f94d11a4f397e72e74f38b3212c24cdee;hp=c643ff63eb3b3f8d3843ed96b3c9ca4da7b52ecd;hpb=05f8c21a6f756a7ae7d9ec95e422f1f1a1c7e030;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/roundcubemail.nix b/modules/private/websites/tools/tools/roundcubemail.nix
index c643ff6..8bb60d6 100644
--- a/modules/private/websites/tools/tools/roundcubemail.nix
+++ b/modules/private/websites/tools/tools/roundcubemail.nix
@@ -17,8 +17,10 @@ rec {
     text = ''
       <?php
         $config['db_dsnw'] = '${env.psql_url}';
-        // This is used as default @domain, don't use "imap.immae.eu" here!
-        $config['default_host'] = 'ssl://mail.immae.eu';
+        $config['default_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_port'] = '587';
@@ -43,6 +45,7 @@ rec {
           'identicon',
           'identity_select',
           'jqueryui',
+          'markasjunk',
           'managesieve',
           'newmail_notifier',
           'vcard_attachments',
@@ -57,11 +60,11 @@ rec {
 
         $config['language'] = 'fr_FR';
 
-        $config['drafts_mbox'] = 'Mail/Drafts';
-        $config['junk_mbox'] = 'Mail/Spam';
-        $config['sent_mbox'] = 'Mail/sent';
-        $config['trash_mbox'] = ''';
-        $config['default_folders'] = array('INBOX', 'Mail/Drafts', 'Mail/sent', 'Mail/Spam', ''');
+        $config['drafts_mbox'] = 'Drafts';
+        $config['junk_mbox'] = 'Junk';
+        $config['sent_mbox'] = 'Sent';
+        $config['trash_mbox'] = 'Trash';
+        $config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
         $config['draft_autosave'] = 60;
         $config['enable_installer'] = false;
         $config['log_driver'] = 'file';