kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-07-22 16:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solved openproject variable bug

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-20 09:44:14 +02:00
parent d86ca6cc0e
commit 6b35454f35
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/web-app-openproject/templates/docker-compose.yml.j2
View File

@ -10,7 +10,7 @@ x-op-app: &app
{% include 'roles/docker-compose/templates/base.yml.j2' %} {% include 'roles/docker-compose/templates/base.yml.j2' %}
cache: cache:
image: "{{ openproject_cache_image}}:{{openproject_cache_version }}" image: "{{ openproject_cache_image}}:{{ openproject_cache_version }}"
container_name: {{ openproject_cache_name }} container_name: {{ openproject_cache_name }}
{% include 'roles/docker-container/templates/base.yml.j2' %} {% include 'roles/docker-container/templates/base.yml.j2' %}

22
roles/web-app-openproject/vars/main.yml
View File

@ -11,20 +11,18 @@ openproject_cron_name: "{{ applications | get_app_conf(application_id, 'd
openproject_proxy_name: "{{ applications | get_app_conf(application_id, 'docker.services.proxy.name', True) }}" openproject_proxy_name: "{{ applications | get_app_conf(application_id, 'docker.services.proxy.name', True) }}"
openproject_worker_name: "{{ applications | get_app_conf(application_id, 'docker.services.worker.name', True) }}" openproject_worker_name: "{{ applications | get_app_conf(application_id, 'docker.services.worker.name', True) }}"
openproject_cache_name: "{{ applications | get_app_conf(application_id, 'docker.services.cache.name', True) }}" openproject_cache_name: "{{ applications | get_app_conf(application_id, 'docker.services.cache.name', True) }}"
openproject_cache_image: >- openproject_cache_image: "{{ applications
{{ applications
| get_app_conf(application_id, 'docker.services.cache.image') | get_app_conf(application_id, 'docker.services.cache.image')
or applications or applications
| get_app_conf('svc-db-memcached', 'docker.services.memcached.image') | get_app_conf('svc-db-memcached', 'docker.services.memcached.image')
}} }}"
openproject_cache_version: >- openproject_cache_version: "{{ applications
{{ applications
| get_app_conf(application_id, 'docker.services.cache.version') | get_app_conf(application_id, 'docker.services.cache.version')
or applications or applications
| get_app_conf('svc-db-memcached', 'docker.services.memcached.version') | get_app_conf('svc-db-memcached', 'docker.services.memcached.version')
}} }}"
openproject_plugins_folder: "{{docker_compose.directories.volumes}}plugins/" openproject_plugins_folder: "{{docker_compose.directories.volumes}}plugins/"
@ -43,10 +41,8 @@ openproject_rails_settings:
smtp_ssl: false smtp_ssl: false
openproject_filters: openproject_filters:
administrators: >- administrators: "{{ '(memberOf=cn=openproject-admins,' ~ ldap.dn.ou.roles ~ ')'
{{ '(memberOf=cn=openproject-admins,' ~ ldap.dn.ou.roles ~ ')' if applications | get_app_conf(application_id, 'ldap.filters.administrators', True) else '' }}"
if applications | get_app_conf(application_id, 'ldap.filters.administrators', True) else '' }}
users: >- users: "{{ '(memberOf=cn=openproject-users,' ~ ldap.dn.ou.roles ~ ')'
{{ '(memberOf=cn=openproject-users,' ~ ldap.dn.ou.roles ~ ')' if applications | get_app_conf(application_id, 'ldap.filters.users', True) else '' }}"
if applications | get_app_conf(application_id, 'ldap.filters.users', True) else '' }}