kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-10-31 10:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Overall optimations for application id naming

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-07-17 17:41:52 +02:00
parent 562603a8cd
commit 409e659143
9 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/cmp-rdbms/vars/database.yml
View File

@@ -6,8 +6,8 @@ _database_central_enabled: "{{ applications | get_app_conf(database_appli
# Definition
database_name: "{{ applications | get_app_conf( database_application_id, 'database.name', false, _database_consumer_entity_name ) }}" # The overwritte configuration is needed by bigbluebutton
database_instance: "{{ _database_central_name if _database_central_enabled else database_name }}" # This could lead to bugs at dedicated database @todo cleanup
database_host: "{{ _database_central_name if _database_central_enabled else 'database' }}" # This could lead to bugs at dedicated database @todo cleanup
database_instance: "{{ _database_central_name if _database_central_enabled else database_name }}" # This could lead to bugs at dedicated database @todo cleanup
database_host: "{{ _database_central_name if _database_central_enabled else 'database' }}" # This could lead to bugs at dedicated database @todo cleanup
database_username: "{{ applications | get_app_conf(database_application_id, 'database.username', false, _database_consumer_entity_name)}}" # The overwritte configuration is needed by bigbluebutton
database_password: "{{ applications | get_app_conf(database_application_id, 'credentials.database_password', true) }}"
database_port: "{{ ports.localhost.database[ _database_id ] }}"

2
roles/docker-compose/templates/volumes.yml.j2
View File

@@ -1,6 +1,6 @@
{# This template needs to be included in docker-compose.yml which contain a database and additional volumes #}
volumes:
{% if not applications | get_app_conf(application_id, 'features.central_database', False)%}
{% if not applications | get_app_conf(application_id, 'features.central_database', False) and applications | get_app_conf(application_id, 'docker.services.database.enabled', False) %}
database:
name: {{ database_volume }}
{% endif %}

2
roles/docker-compose/vars/docker-compose.yml
View File

@@ -1,2 +1,2 @@
# @See https://chatgpt.com/share/67a23d18-fb54-800f-983c-d6d00752b0b4
docker_compose: "{{ path_docker_compose_instances | get_docker_paths(application_id) }}"
docker_compose: "{{ application_id | get_docker_paths(path_docker_compose_instances) }}"