kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-04-28 18:30:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactored database urls

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-04-27 18:13:16 +02:00
parent da89bb6ed1
commit 3e816130d3
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/docker-central-database/vars/database.yml
View File

@ -4,5 +4,5 @@ database_name: "{{ application_id }}"
database_username: "{{ application_id }}" database_username: "{{ application_id }}"
database_port: "{{ 3306 if database_type == 'mariadb' else 5432 }}" database_port: "{{ 3306 if database_type == 'mariadb' else 5432 }}"
database_env: "{{docker_compose.directories.env}}{{database_type}}.env" 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 }}"
# Don't set application_id . It would conflict with central database logic database_url_full: "{{database_type}}://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}"

2
roles/docker-funkwhale/templates/env.j2
View File

@ -118,4 +118,4 @@ LDAP_ROOT_DN = "{{ldap.dn.root}}"
FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist
DATABASE_URL = postgresql://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }} DATABASE_URL = {{ database_url_full }}

2
roles/docker-keycloak/templates/env.j2
View File

@ -13,7 +13,7 @@ KC_METRICS_ENABLED= true
KEYCLOAK_ADMIN= "{{applications.keycloak.users.administrator.username}}" KEYCLOAK_ADMIN= "{{applications.keycloak.users.administrator.username}}"
KEYCLOAK_ADMIN_PASSWORD= "{{applications.keycloak.administrator_password}}" KEYCLOAK_ADMIN_PASSWORD= "{{applications.keycloak.administrator_password}}"
KC_DB= postgres KC_DB= postgres
KC_DB_URL= jdbc:postgresql://{{database_host}}/{{database_name}} KC_DB_URL= {{database_url_jdbc}}
KC_DB_USERNAME= {{database_username}} KC_DB_USERNAME= {{database_username}}
KC_DB_PASSWORD= {{database_password}} KC_DB_PASSWORD= {{database_password}}

2
roles/docker-openproject/templates/env.j2
View File

@ -11,7 +11,7 @@ OPENPROJECT_HOST__NAME={{domains[application_id]}}
OPENPROJECT_RAILS__RELATIVE__URL__ROOT= OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
IMAP_ENABLED=false IMAP_ENABLED=false
POSTGRES_PASSWORD="{{ database_password }}" POSTGRES_PASSWORD="{{ database_password }}"
DATABASE_URL="postgres://{{ database_username }}:{{ database_password }}@{{database_host}}/{{database_name}}?pool=20&encoding=unicode&reconnect=true" DATABASE_URL="{{ database_url_full }}?pool=20&encoding=unicode&reconnect=true"
RAILS_MIN_THREADS=4 RAILS_MIN_THREADS=4
RAILS_MAX_THREADS=16 RAILS_MAX_THREADS=16
OPENPROJECT_HSTS=true OPENPROJECT_HSTS=true