refactor: normalize Jinja2 spacing in volume paths and add async support in backup task

- Standardized spacing in {{ docker_compose.directories.volumes }} across multiple roles
- Added async and poll support to sys-bkp-docker-2-loc database seeding and file permission tasks
- Moved Installation.md for web-app-matrix into docs/ for better structure
This commit is contained in:
Kevin Veen-Birkenbach 2025-08-18 01:05:01 +02:00
parent 3d7bbabd7b
commit a5941763ff
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
7 changed files with 11 additions and 7 deletions

View File

@ -8,7 +8,7 @@ openldap_bind_dn: "{{ ldap.dn.administrator.configuration }}"
openldap_bind_pw: "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
# LDIF Variables
openldap_ldif_host_path: "{{docker_compose.directories.volumes}}ldif/"
openldap_ldif_host_path: "{{ docker_compose.directories.volumes }}ldif/"
openldap_ldif_docker_path: "/tmp/ldif/"
openldap_ldif_types:
- configuration

View File

@ -43,6 +43,8 @@
- database_username is defined
- database_password is defined
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
- name: Set file permissions for databases.csv to be readable, writable, and executable by root only
ansible.builtin.file:
@ -57,6 +59,8 @@
database_password is defined) and
run_once_sys_bkp_docker_2_loc_file_permission is not defined
register: file_permission_result
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
- name: run the backup_docker_to_local_file_permission tasks once
set_fact:

View File

@ -41,7 +41,7 @@
ports:
- "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
volumes:
- "{{docker_compose.directories.volumes}}nginx.conf:/etc/nginx/nginx.conf:ro"
- "{{ docker_compose.directories.volumes }}nginx.conf:/etc/nginx/nginx.conf:ro"
volumes_from:
- application

View File

@ -7,5 +7,5 @@
ports:
- {{ports.localhost.oauth2_proxy[application_id]}}:4180/tcp
volumes:
- "{{docker_compose.directories.volumes}}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
- "{{ docker_compose.directories.volumes }}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
{% endif %}

View File

@ -29,12 +29,12 @@ openproject_cache_version: "{{ applications
}}"
openproject_plugins_folder: "{{docker_compose.directories.volumes}}plugins/"
openproject_plugins_folder: "{{ docker_compose.directories.volumes }}plugins/"
openproject_custom_image: "custom_openproject"
# The following volume doesn't have a practcical function. It just exist to prevent the creation of unnecessary anonymous volumes
openproject_dummy_volume: "{{docker_compose.directories.volumes}}dummy_volume"
openproject_dummy_volume: "{{ docker_compose.directories.volumes }}dummy_volume"
openproject_rails_settings:
email_delivery_method: "smtp"

View File

@ -1,6 +1,6 @@
pgadmin_host_server_file: "{{docker_compose.directories.volumes}}servers.json"
pgadmin_host_server_file: "{{ docker_compose.directories.volumes }}servers.json"
pgadmin_docker_server_file: "/pgadmin4/servers.json"
pgadmin_host_password_file: "{{docker_compose.directories.volumes}}.pgpass"
pgadmin_host_password_file: "{{ docker_compose.directories.volumes }}.pgpass"
pgadmin_docker_password_file: "/pgpass"
pgadmin_servers: