From 8059f272d5d9cfbb403b6c67af410863d4a84304 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 2 Sep 2025 14:07:38 +0200
Subject: [PATCH] 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

---
 roles/web-app-confluence/templates/env.j2 | 11 ++++++-----
 roles/web-app-jira/templates/env.j2       | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/roles/web-app-confluence/templates/env.j2 b/roles/web-app-confluence/templates/env.j2
index 98a96737..fc9b8b2e 100644
--- a/roles/web-app-confluence/templates/env.j2
+++ b/roles/web-app-confluence/templates/env.j2
@@ -1,6 +1,7 @@
 ## Confluence core
 CONFLUENCE_URL="{{ CONFLUENCE_URL }}"
 
+
 ATL_PROXY_NAME={{ CONFLUENCE_HOSTNAME }}
 ATL_PROXY_PORT={{ WEB_PORT }}
 ATL_TOMCAT_SCHEME={{ WEB_PROTOCOL }}
@@ -9,11 +10,11 @@ JVM_MINIMUM_MEMORY={{ CONFLUENCE_JVM_MIN }}
 JVM_MAXIMUM_MEMORY={{ CONFLUENCE_JVM_MAX }}
 
 ## Database
-CONFLUENCE_DATABASE_NAME="{{ database_name }}"
-CONFLUENCE_DATABASE_USER="{{ database_username }}"
-CONFLUENCE_DATABASE_PASSWORD="{{ database_password }}"
-CONFLUENCE_DATABASE_HOST="{{ database_host }}"
-CONFLUENCE_DATABASE_PORT="{{ database_port }}"
+ATL_DB_TYPE=postgres72
+ATL_DB_DRIVER=org.postgresql.Driver
+ATL_JDBC_URL=jdbc:postgresql://{{ database_host }}:{{ database_port }}/{{ database_name }}
+ATL_JDBC_USER={{ database_username }}
+ATL_JDBC_PASSWORD={{ database_password }}
 
 ## OIDC
 {% if CONFLUENCE_OIDC_ENABLED %}
diff --git a/roles/web-app-jira/templates/env.j2 b/roles/web-app-jira/templates/env.j2
index e6e4d006..1dc89fe2 100644
--- a/roles/web-app-jira/templates/env.j2
+++ b/roles/web-app-jira/templates/env.j2
@@ -2,11 +2,11 @@
 JIRA_URL="{{ JIRA_URL }}"
 
 ## Database
-JIRA_DATABASE_NAME="{{ database_name }}"
-JIRA_DATABASE_USER="{{ database_username }}"
-JIRA_DATABASE_PASSWORD="{{ database_password }}"
-JIRA_DATABASE_HOST="{{ database_host }}"
-JIRA_DATABASE_PORT="{{ database_port }}"
+ATL_DB_TYPE=postgres72
+ATL_DB_DRIVER=org.postgresql.Driver
+ATL_JDBC_URL=jdbc:postgresql://{{ database_host }}:{{ database_port }}/{{ database_name }}
+ATL_JDBC_USER={{ database_username }}
+ATL_JDBC_PASSWORD={{ database_password }}
 
 ATL_PROXY_NAME={{ JIRA_HOSTNAME }}
 ATL_PROXY_PORT={{ WEB_PORT }}