From 42447ba066036c95488df14944f74d9e490c0c65 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 12 Oct 2020 15:52:05 +0200
Subject: [PATCH] Add some preferences to the config template. Do not override
 the junk folder

---
 defaults/main.yml           | 13 +++++++++++++
 templates/config.inc.php.j2 | 39 +++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 2f548d1..7db4c33 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -45,6 +45,19 @@ roundcube_login_lc: 0
 roundcube_memcache_hosts:
   - '127.0.0.1:11211'
 
+roundcube_default_drafts_folder: 'Drafts'
+roundcube_default_spam_folder: 'Junk'
+roundcube_default_sent_folder: 'Sent'
+roundcube_default_trash_folder: 'Trash'
+roundcube_not_overrideable_special_folders: '{{ roundcube_default_spam_folder }}'
+roundcube_protect_default_folders: true
+roundcube_create_default_folders: true
+roundcube_show_default_folders_real_name: true
+roundcube_auto_create_user: true
+roundcube_user_aliases: false
+roundcube_dont_override_settings:
+  - 'junk_mbox'
+
 # redis
 redis_install: '{{ roundcube_redis_install }}'
 # PHP
diff --git a/templates/config.inc.php.j2 b/templates/config.inc.php.j2
index ef140ea..79f4742 100644
--- a/templates/config.inc.php.j2
+++ b/templates/config.inc.php.j2
@@ -91,6 +91,16 @@ $config['product_name'] = '{{ roundcube_product_name }}';
 $config['des_key'] = '{{ roundcube_crypt_key }}';
 $config['cipher_method'] = 'AES-256-CBC';
 
+// don't allow these settings to be overridden by the user
+$config['dont_override'] = array({% for setting in roundcube_dont_override_settings %}'{{ setting }}'{% if not loop.last %}, {% endif %} {% endfor %});
+
+// List of disabled UI elements/actions
+$config['disabled_actions'] = array();
+
+// define which settings should be listed under the 'advanced' block
+// which is hidden by default
+$config['advanced_prefs'] = array();
+
 // List of active plugins (in plugins/ directory)
 $config['plugins'] = array({% for plug in roundcube_default_plugins %}'{{ plug }}', {% endfor %}{% for opt_plug in roundcube_optional_plugins %}'{{ opt_plug }}', {% endfor %}{% for add_plug in roundcube_additional_plugins %}'{{ add_plug }}', {% endfor %}{% if roundcube_install_enigma %}'{{ roundcube_enigma_plugin }}'{% endif %});
 
@@ -222,6 +232,14 @@ $config['max_message_size'] = '{{ roundcube_max_attachments_size }}M';
 // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
 $config['enable_installer'] = false;
 
+// automatically create a new Roundcube user when log-in the first time.
+// a new user will be created once the IMAP login succeeds.
+// set to false if only registered users can use this service
+$config['auto_create_user'] = {{ roundcube_auto_create_user }};
+
+// Enables possibility to log in using email address from user identities
+$config['user_aliases'] = {{ roundcube_user_aliases }};
+
 // skin name: folder from skins/
 $config['skin'] = '{{ roundcube_default_skin }}';
 
@@ -335,8 +353,25 @@ $config['mail_domain'] = '{{ roundcube_domain_name }}';
 $config['http_received_header_encrypt'] = {{ roundcube_http_received_header_encrypt }};
 $config['identities_level'] = {{ roundcube_identities_level }};
 
-$config['create_default_folders'] = true;
-$config['show_real_foldernames'] = true;
+// store draft message is this mailbox
+// leave blank if draft messages should not be stored
+// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
+$config['drafts_mbox'] = '{{ roundcube_default_drafts_folder }}';
+// store spam messages in this mailbox
+// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
+$config['junk_mbox'] = '{{ roundcube_default_spam_folder }}';
+// store sent message is this mailbox
+// leave blank if sent messages should not be stored
+// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
+$config['sent_mbox'] = '{{ roundcube_default_sent_folder }}';
+// move messages to this folder when deleting them
+// leave blank if they should be deleted directly
+// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
+$config['trash_mbox'] = '{{ roundcube_default_trash_folder }}';
+// protect the default folders from renames, deletes, and subscription changes
+$config['protect_default_folders'] = {{ roundcube_protect_default_folders }};
+$config['create_default_folders'] = {{ roundcube_create_default_folders }};
+$config['show_real_foldernames'] = {{ roundcube_show_default_folders_real_name }};
 $config['enable_spellcheck'] = {{ roundcube_enable_spellcheck }};
 $config['show_images'] = {{ roundcube_show_images }};
 $config['htmleditor'] = {{ roundcube_html_editor }};