Skip to content

Commit

Permalink
new path for themes with redmine6
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandermeindl committed Nov 9, 2024
1 parent cab9b40 commit 80a27ca
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 0 additions & 2 deletions roles/redmine/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ redmine_write_permission_dirs:
- path: /db
- path: /tmp
- path: /log
- path: /public/plugin_assets
- path: /public/assets
# for additional_tags hint file
- path: /plugins

Expand Down
16 changes: 16 additions & 0 deletions roles/redmine/tasks/account_instance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,22 @@
recurse: '{{ item.recurse | default(False) }}'
loop: '{{ redmine_write_permission_dirs }}'

- name: Set writable permission for assets with Redmine < 6

Check warning on line 108 in roles/redmine/tasks/account_instance.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

args[module]

Unsupported parameters for (basic.py) module: when. Supported parameters include: _diff_peek, _original_basename, access_time, access_time_format, attributes, follow, force, group, mode, modification_time, modification_time_format, owner, path, recurse, selevel, serole, setype, seuser, src, state, unsafe_writes (attr, dest, name).
ansible.builtin.file:
path: '{{ redmine_app_dir }}/public/plugin_assets'
owner: root
group: '{{ redmine_group }}'
mode: '0775'
when: active_redmine_repo_version != '6.0-stable'

- name: Set writable permission for assets with Redmine = 6

Check warning on line 116 in roles/redmine/tasks/account_instance.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

args[module]

Unsupported parameters for (basic.py) module: when. Supported parameters include: _diff_peek, _original_basename, access_time, access_time_format, attributes, follow, force, group, mode, modification_time, modification_time_format, owner, path, recurse, selevel, serole, setype, seuser, src, state, unsafe_writes (attr, dest, name).
ansible.builtin.file:
path: '{{ redmine_app_dir }}/public/assets'
owner: root
group: '{{ redmine_group }}'
mode: '0775'
when: active_redmine_repo_version == '6.0-stable'

- name: Include redmine patch tasks
ansible.builtin.include_tasks: account_redmine_patch.yml
loop: "{{ active_redmine_patches }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/redmine/tasks/set_instance_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
redmine_config_dir: "{{ redmine_global_config_dir }}/{{ instance_name }}"
redmine_plugin_dir: "{{ redmine_app_dir }}/plugins"
redmine_plugin_assets_dir: "{{ redmine_app_dir }}/public/plugin_assets"
redmine_theme_dir: "{{ redmine_app_dir }}/public/themes"
redmine_theme_dir: "{{ redmine_app_dir }}{{ '/themes' if active_redmine_repo_version == '6.0-stable' else '/public/themes' }}"
puma_service_name: puma-{{ instance_name }}
active_db_adapter: "{{ instance.adapter | default(redmine_db_adapter) }}"
active_mysql_socket: "{{ instance.mysql_socket | default(redmine_mysql_socket) }}"
Expand Down

0 comments on commit 80a27ca

Please sign in to comment.