Merge pull request 'roundcube: disable the help plugin by default, it's not useful.' (#156) from adellam/ansible-roles:master into master

library/roles/roundcube/defaults/main.yml

@@ -1,5 +1,6 @@
 ---
-roundcube_version: 1.4.1
+roundcube_version: 1.4.3
+roundcube_upgrade: False
 roundcube_dist: 'roundcubemail-{{ roundcube_version }}'
 roundcube_dist_filename: '{{ roundcube_dist }}-complete.tar.gz'
 roundcube_download_url: 'https://github.com/roundcube/roundcubemail/releases/download/{{ roundcube_version }}/{{ roundcube_dist_filename }}'
@@ -76,7 +77,6 @@ roundcube_default_plugins:
   - database_attachments
   - debug_logger
   - emoticons
-  - help
   - hide_blockquote
   - identicon
   - identity_select
@@ -91,6 +91,7 @@ roundcube_default_plugins:
   - userinfo
   - zipdownload
 
+# The help plugin points by default to an english-only and obsolete documentation
 roundcube_optional_plugins:
   - virtuser_file
   - virtuser_query
@@ -103,6 +104,7 @@ roundcube_optional_plugins:
   - redundant_attachments
   - managesieve
   - krb_authentication
+  #- help
 
 roundcube_default_skin: 'elastic'
 roundcube_available_skins: 
@@ -140,6 +142,11 @@ roundcube_additional_plugins: []
 #roundcube_additional_plugins:
 #  - identity_smtp
 
+# The help docs are too old to be useful
+roundcube_help_url: "http://docs.roundcube.net/doc/help/1.1/en_US/"
+#roundcube_help_url: 'https://www.roundcubeforum.net'
+roundcube_help_extwin: 'false'
+
 # In Megabytes. This affects both the nginx/apache and php configurations
 roundcube_max_attachments_size: 5
 # This one is represented in bytes instead.

library/roles/roundcube/tasks/roundcube-install.yml

@@ -1,5 +1,14 @@
 ---
-- block:
+- name: Prepare roundcube for upgrade
+  block:
+  - name: Remove the roundcube current installation
+    file: dest={{ roundcube_web_root }} state=absent
+
+  when: roundcube_upgrade | bool
+  tags: [ 'roundcube', 'roundcube_upgrade' ]
+
+- name: Install Roundcube
+  block:
   - name: Create the roundcube webroot
     file: dest={{ roundcube_web_basedir }} owner=root group=root state=directory
 

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

@@ -346,3 +346,19 @@ $config['managesieve_vacation'] = {{ roundcube_managesieve_vacation }};
 $config['managesieve_forward'] = {{ roundcube_managesieve_forward }};
 {% endif %}
 
+// Help URL. The default does not work
+$config['help_source'] = '{{ roundcube_help_url }}';
+// Map to translate Roundcube language codes into help document languages
+// The '*' entry will be used as default
+$config['help_language_map'] = array('*' => 'en_US');
+
+// Enter an absolute URL to a page displaying information about this webmail
+// Alternatively, create a HTML file under <this-plugin-dir>/content/about.html
+$config['help_about_url'] = null;
+
+// Enter an absolute URL to a page displaying information about this webmail
+// Alternatively, put your license text to <this-plugin-dir>/content/license.html
+$config['help_license_url'] = null;
+
+// Determine whether to open the help in a new window
+$config['help_open_extwin'] = {{ roundcube_help_extwin }};