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

Refactor Confluence and Jira env templates to use official Atlassian ATL_* database variables instead of unused custom placeholders. Ensures containers connect directly to PostgreSQL without relying on CONFLUENCE_DATABASE_* or JIRA_DATABASE_* vars. See conversation: https://chatgpt.com/share/68b6ddfd-3c44-800f-a57e-244dbd7ceeb5

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-09-02 14:07:38 +02:00
parent 7c814e6e83
commit 8059f272d5
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
roles/web-app-confluence/templates/env.j2
View File

@@ -1,6 +1,7 @@
## Confluence core ## Confluence core
CONFLUENCE_URL="{{ CONFLUENCE_URL }}" CONFLUENCE_URL="{{ CONFLUENCE_URL }}"
ATL_PROXY_NAME={{ CONFLUENCE_HOSTNAME }} ATL_PROXY_NAME={{ CONFLUENCE_HOSTNAME }}
ATL_PROXY_PORT={{ WEB_PORT }} ATL_PROXY_PORT={{ WEB_PORT }}
ATL_TOMCAT_SCHEME={{ WEB_PROTOCOL }} ATL_TOMCAT_SCHEME={{ WEB_PROTOCOL }}
@@ -9,11 +10,11 @@ JVM_MINIMUM_MEMORY={{ CONFLUENCE_JVM_MIN }}
JVM_MAXIMUM_MEMORY={{ CONFLUENCE_JVM_MAX }} JVM_MAXIMUM_MEMORY={{ CONFLUENCE_JVM_MAX }}
## Database ## Database
CONFLUENCE_DATABASE_NAME="{{ database_name }}" ATL_DB_TYPE=postgres72
CONFLUENCE_DATABASE_USER="{{ database_username }}" ATL_DB_DRIVER=org.postgresql.Driver
CONFLUENCE_DATABASE_PASSWORD="{{ database_password }}" ATL_JDBC_URL=jdbc:postgresql://{{ database_host }}:{{ database_port }}/{{ database_name }}
CONFLUENCE_DATABASE_HOST="{{ database_host }}" ATL_JDBC_USER={{ database_username }}
CONFLUENCE_DATABASE_PORT="{{ database_port }}" ATL_JDBC_PASSWORD={{ database_password }}
## OIDC ## OIDC
{% if CONFLUENCE_OIDC_ENABLED %} {% if CONFLUENCE_OIDC_ENABLED %}

10
roles/web-app-jira/templates/env.j2
View File

@@ -2,11 +2,11 @@
JIRA_URL="{{ JIRA_URL }}" JIRA_URL="{{ JIRA_URL }}"
## Database ## Database
JIRA_DATABASE_NAME="{{ database_name }}" ATL_DB_TYPE=postgres72
JIRA_DATABASE_USER="{{ database_username }}" ATL_DB_DRIVER=org.postgresql.Driver
JIRA_DATABASE_PASSWORD="{{ database_password }}" ATL_JDBC_URL=jdbc:postgresql://{{ database_host }}:{{ database_port }}/{{ database_name }}
JIRA_DATABASE_HOST="{{ database_host }}" ATL_JDBC_USER={{ database_username }}
JIRA_DATABASE_PORT="{{ database_port }}" ATL_JDBC_PASSWORD={{ database_password }}
ATL_PROXY_NAME={{ JIRA_HOSTNAME }} ATL_PROXY_NAME={{ JIRA_HOSTNAME }}
ATL_PROXY_PORT={{ WEB_PORT }} ATL_PROXY_PORT={{ WEB_PORT }}