Merge branch 'master' of adellam/ansible-roles into master

library/roles/roundcube/defaults/main.yml

@@ -65,6 +65,8 @@ roundcube_show_images: 0
 #  3 - on forward or reply to HTML message
 #  4 - always, except when replying to plain text message
 roundcube_html_editor: 0
+# In minutes
+roundcube_session_lifetime: 60
 
 roundcube_default_plugins:
   - acl

library/roles/roundcube/templates/config.inc.php.j2

@@ -301,6 +301,18 @@ $config['login_lc'] = {{ roundcube_login_lc }};
 
 $config['display_product_info'] = 0;
 
+// Session lifetime in minutes
+$config['session_lifetime'] = {{ roundcube_session_lifetime }};
+
+// Session domain: .example.org
+$config['session_domain'] = '';
+
+// Session name. Default: 'roundcube_sessid'
+$config['session_name'] = null;
+
+// Session authentication cookie name. Default: 'roundcube_sessauth'
+$config['session_auth_name'] = null;
+
 {% if roundcube_use_memcache %}
 $config['session_storage'] = 'memcache';
 {% elif roundcube_use_redis %}