Solved wrong namings

This commit is contained in:
2025-07-11 02:59:25 +02:00
parent f9b3fb8cfa
commit 7fba13b550
15 changed files with 96 additions and 29 deletions

View File

@@ -1,5 +1,5 @@
# The following env file will just be used from the dedicated mariadb container
# and not the {{applications.mariadb.hostname }}-database
# and not the {{applications['rdbms-mariadb'].hostname }}-database
- name: "Create {{database_env}}"
template:
src: "env/{{database_type}}.env.j2"

View File

@@ -1,7 +1,7 @@
# This template needs to be included in docker-compose.yml, which depend on a postgres database
{% if not applications | is_feature_enabled('central_database',application_id) %}
{{ database_host }}:
image: postgres:{{applications.postgres.version}}-alpine
image: postgres:{{applications['rdbms-postgres'].version}}-alpine
container_name: {{application_id}}-database
env_file:
- {{database_env}}

View File

@@ -3,7 +3,7 @@ database_host: "{{ 'central-' + database_type if applications | is_feature_
database_name: "{{ applications[database_application_id].database.name | default( database_application_id ) }}" # The overwritte configuration is needed by bigbluebutton
database_username: "{{ applications[database_application_id].database.username | default( database_application_id )}}" # The overwritte configuration is needed by bigbluebutton
database_password: "{{ applications[database_application_id].credentials.database_password }}"
database_port: "{{ 3306 if database_type == 'mariadb' else applications.postgres.port }}"
database_port: "{{ 3306 if database_type == 'mariadb' else applications['rdbms-postgres'].port }}"
database_env: "{{docker_compose.directories.env}}{{database_type}}.env"
database_url_jdbc: "jdbc:{{ database_type if database_type == 'mariadb' else 'postgresql' }}://{{ database_host }}:{{ database_port }}/{{ database_name }}"
database_url_full: "{{database_type}}://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}"