Skip to content

Commit eed2539

Browse files
MarketingCampaignsReporting for matomo updated to 5.1.5 and Redmine fixes for Redmine 6.1
1 parent 30cafbb commit eed2539

3 files changed

Lines changed: 3 additions & 16 deletions

File tree

roles/matomo/vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ matomo_available_plugins:
2323
use_git: true
2424
repo: https://github.com/matomo-org/plugin-MarketingCampaignsReporting.git
2525
download: https://github.com/matomo-org/plugin-MarketingCampaignsReporting/archive/%%version%%.tar.gz
26-
version: 5.1.3
27-
branch: 5.1.3
26+
version: 5.1.5
27+
branch: 5.1.5
2828
Migration:
2929
use_git: true
3030
repo: https://github.com/matomo-org/plugin-Migration.git

roles/redmine/tasks/account_instance.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,13 @@
105105
recurse: '{{ item.recurse | default(False) }}'
106106
loop: '{{ redmine_write_permission_dirs }}'
107107

108-
- name: Set writable permission for assets with Redmine < 6
109-
ansible.builtin.file:
110-
path: '{{ redmine_app_dir }}/public/plugin_assets'
111-
owner: root
112-
group: '{{ redmine_group }}'
113-
mode: '0775'
114-
state: directory
115-
when: active_redmine_repo_version != '6.0-stable'
116-
117-
- name: Set writable permission for assets with Redmine = 6
108+
- name: Set writable permission for assets
118109
ansible.builtin.file:
119110
path: '{{ redmine_app_dir }}/public/assets'
120111
owner: root
121112
group: '{{ redmine_group }}'
122113
mode: '0775'
123114
state: directory
124-
when: active_redmine_repo_version == '6.0-stable'
125115

126116
- name: Include redmine patch tasks
127117
ansible.builtin.include_tasks: account_redmine_patch.yml

roles/redmine/templates/redmine/Gemfile.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ gem 'puma'
1212
{% if instance.without_dalli is undefined or not instance.without_dalli %}
1313
gem 'dalli'
1414
{% endif %}
15-
{% if active_redmine_repo_version != '6.0-stable' %}
16-
gem 'connection_pool'
17-
{% endif %}
1815
{% endif %}
1916
{% if instance.with_mysql2postgres is defined and instance.with_mysql2postgres %}
2017
gem 'mysql2postgres'

0 commit comments

Comments
 (0)