diff --git a/roles/web-app-openproject/templates/docker-compose.yml.j2 b/roles/web-app-openproject/templates/docker-compose.yml.j2 index 2285a9ca..244a7307 100644 --- a/roles/web-app-openproject/templates/docker-compose.yml.j2 +++ b/roles/web-app-openproject/templates/docker-compose.yml.j2 @@ -10,7 +10,7 @@ x-op-app: &app {% include 'roles/docker-compose/templates/base.yml.j2' %} cache: - image: "{{ openproject_cache_image}}:{{openproject_cache_version }}" + image: "{{ openproject_cache_image}}:{{ openproject_cache_version }}" container_name: {{ openproject_cache_name }} {% include 'roles/docker-container/templates/base.yml.j2' %} diff --git a/roles/web-app-openproject/vars/main.yml b/roles/web-app-openproject/vars/main.yml index 89702d39..ad148388 100644 --- a/roles/web-app-openproject/vars/main.yml +++ b/roles/web-app-openproject/vars/main.yml @@ -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_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_image: >- - {{ applications +openproject_cache_name: "{{ applications | get_app_conf(application_id, 'docker.services.cache.name', True) }}" +openproject_cache_image: "{{ applications | get_app_conf(application_id, 'docker.services.cache.image') or applications | get_app_conf('svc-db-memcached', 'docker.services.memcached.image') - }} + }}" -openproject_cache_version: >- - {{ applications +openproject_cache_version: "{{ applications | get_app_conf(application_id, 'docker.services.cache.version') or applications | get_app_conf('svc-db-memcached', 'docker.services.memcached.version') - }} + }}" openproject_plugins_folder: "{{docker_compose.directories.volumes}}plugins/" @@ -43,10 +41,8 @@ openproject_rails_settings: smtp_ssl: false openproject_filters: - administrators: >- - {{ '(memberOf=cn=openproject-admins,' ~ ldap.dn.ou.roles ~ ')' - if applications | get_app_conf(application_id, 'ldap.filters.administrators', True) else '' }} + administrators: "{{ '(memberOf=cn=openproject-admins,' ~ ldap.dn.ou.roles ~ ')' + if applications | get_app_conf(application_id, 'ldap.filters.administrators', True) else '' }}" - users: >- - {{ '(memberOf=cn=openproject-users,' ~ ldap.dn.ou.roles ~ ')' - if applications | get_app_conf(application_id, 'ldap.filters.users', True) else '' }} + users: "{{ '(memberOf=cn=openproject-users,' ~ ldap.dn.ou.roles ~ ')' + if applications | get_app_conf(application_id, 'ldap.filters.users', True) else '' }}"