Merge pull request 'Version bump - 1.6.7' (#31) from 1.6.7 into staging

Reviewed-on: #31
Reviewed-by: meaz <meaz@no-reply@disroot.org>

defaults/main.yml

@@ -3,7 +3,7 @@
 rcube_pkgs: 
   - 'mariadb-client'
 rcube_release_dir_path: '/var/www/roundcube_releases'
-rcube_version: '1.6.6'
+rcube_version: '1.6.7'
 rcube_latest_path: '/var/www/roundcube_production'
 rcube_app_username: 'www-data'
 rcube_app_group: 'www-data'

tasks/carddav.yml

@@ -7,6 +7,7 @@
     owner: "{{ rcube_app_username }}"
     group: "{{ rcube_app_group }}"
     state: directory
+  tags: carddav
 
 - name: "[CARDDAV] - Install low-level utilities"
   apt:
@@ -14,12 +15,14 @@
       - zip
       - unzip
     state: present
+  tags: carddav
 
 - name: "[CARDDAV] - Install Composer from script"
   script:
     cmd: install_composer.sh
     chdir: "{{ rcube_latest_path }}"
   become_user: '{{ rcube_app_username }}'
+  tags: carddav
 
 - name: "[CARDDAV] - Update composer and related modules"
   shell:
@@ -27,6 +30,7 @@
     chdir: '{{ rcube_latest_path }}'
   become: yes
   become_user: '{{ rcube_app_username }}'
+  tags: carddav
 
 - name: "[CARDDAV] - Deploy composer.json file"
   template:
@@ -35,6 +39,7 @@
     mode: 0644
     owner: "{{ rcube_app_username }}"
     group: "{{ rcube_app_group }}"
+  tags: carddav
 
 - name: "[CARDDAV] - Install / Update carddav with Composer"
   shell:
@@ -42,6 +47,7 @@
     chdir: "{{ rcube_latest_path }}"
   become: yes
   become_user: '{{ rcube_app_username }}'
+  tags: carddav
 
 - name: "[CARDDAV] - Install carddav configuration file"
   template:
@@ -50,11 +56,13 @@
     mode: 0644
     owner: "{{ rcube_app_username }}"
     group: "{{ rcube_app_group }}"
+  tags: carddav
 
 - name: "[CARDDAV] - Carddav is in config file?"
   shell:
       cmd: "grep carddav {{ rcube_latest_path }}/config/config.inc.php ; echo $?"
   register: carddav_in_config
+  tags: carddav
 
 - name: "[CARDDAV] - Add carddav in config.inc.php"
   lineinfile:
@@ -63,4 +71,5 @@
     line: "'carddav',"
     state: present
   when: carddav_in_config.stdout == "1"
+  tags: carddav
 

tasks/custom_patches.yml

@@ -6,3 +6,4 @@
     basedir: '{{ rcube_latest_path }}'
     strip: 1
   with_items: '{{ rcube_custom_patch_list }}'
+  tags: patch

tasks/plugins.yml

@@ -9,7 +9,8 @@
   become: yes
   become_user: "{{ rcube_app_username }}"
   when: item.repo is defined
-  
+  tags: plugins
+
 - name: "[PLUGIN] - Install repo plugins configuration file"
   template:
     src: "plugins/{{ item.name }}/config.inc.php.j2"
@@ -19,6 +20,7 @@
     group: "{{ rcube_app_group }}"
   with_items: '{{ rcube_plugins }}'
   when: item.config is defined and item.config|lower == 'true'
+  tags: plugins
 
 - name: "[PLUGIN] - Cronjob for account_details"
   cron:
@@ -27,3 +29,4 @@
     hour: "*/1"
     job: 'curl https://api.github.com/repos/roundcube/roundcubemail/releases | grep tag_name | grep -o "[0-9].[0-9].[0-9]\{1,\}" | sort -n | tail -1 > {{ rcube_latest_path }}/plugins/account_details/rc_latest.txt'
   when: rcube_plugins|selectattr('name', 'eq', 'account_details')|list
+  tags: plugins

templates/composer.json.j2

@@ -21,15 +21,12 @@
         "pear/net_sieve": "~1.4.5",
         "roundcube/plugin-installer": "~0.3.1",
         "roundcube/rtf-html-php": "~2.1",
-        "masterminds/html5": "~2.8.0",
+        "masterminds/html5": "~2.7.0",
         "bacon/bacon-qr-code": "^2.0.0",
-        "guzzlehttp/guzzle": "^7.3.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^9"
+        "guzzlehttp/guzzle": "^7.3.0",
+        "kolab/net_ldap3": "~1.1.4"
     },
     "suggest": {
-        "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
         "bjeavons/zxcvbn-php": "^1.0 required for Zxcvbn password strength driver"
     },
     "config": {

templates/config.inc.php.j2

@@ -27,7 +27,7 @@ $config = [];
 // Format (compatible with PEAR MDB2): db_provider://user:password@host/database
 // Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
-// NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
+// Note: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
 //       or (Windows): 'sqlite:///C:/full/path/to/sqlite.db'
 $config['db_dsnw'] = '{{ rcube_db_plugin }}://{{ rcube_db_username }}:{{ rcube_db_passwd }}@{{ rcube_db_hostname }}/{{ rcube_db_name }}';
 
@@ -79,12 +79,12 @@ $config['smtp_host'] = '{{ rcube_security_proto }}://{{ rcube_smtp_server }}:{{
 // To specify different SMTP servers for different IMAP hosts provide an array
 // of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net']
 
-// SMTP username (if required) if you use %u as the username Roundcube
-// will use the current username for login
+// SMTP username (if required)
+// Note: %u variable will be replaced with current user's username
 $config['smtp_user'] = '{{ rcube_smtp_user }}';
 
-// SMTP password (if required) if you use %p as the password Roundcube
-// will use the current user's password for login
+// SMTP password (if required)
+// Note: When set to '%p' current user's password will be used
 $config['smtp_pass'] = '{{ rcube_smtp_passwd }}';
 
 // Log sent messages to <log_dir>/sendmail.log or to syslog
@@ -121,7 +121,7 @@ $config['support_url'] = '{{ rcube_support_url }}';
 // This is used by the 'file' log driver.
 $config['log_dir'] = '{{ rcube_logdir }}';
 
-// use this folder to store temp files
+// Location of temporary saved files such as attachments and cache files
 // must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
 $config['temp_dir'] = '{{ rcube_temp_dir }}';// Name your service. This is displayed on the login screen and in the window title// This key is used to encrypt the users imap password which is stored
 // in the session record. For the default cipher method it must be