From 77f4b2bfd022a438fa31663bacbe0add1b92d178 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 15 Aug 2019 14:29:18 +1000
Subject: [PATCH] DCD-545: Move fallback home vars to templates.

---
 config/confluence-init.properties.j2 | 2 +-
 config/confluence.cfg.xml.j2         | 4 ++--
 entrypoint.py                        | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/confluence-init.properties.j2 b/config/confluence-init.properties.j2
index b2ecc60..43ff300 100644
--- a/config/confluence-init.properties.j2
+++ b/config/confluence-init.properties.j2
@@ -1 +1 @@
-confluence.home = {{ atl_product_home }}
+confluence.home = {{ atl_product_home | default(confluence_home) | default('') }}
diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2
index 80a2009..3453e93 100644
--- a/config/confluence.cfg.xml.j2
+++ b/config/confluence.cfg.xml.j2
@@ -39,8 +39,8 @@
     {% if atl_cluster_type is defined %}
       <property name="confluence.cluster">true</property>
       <property name="confluence.cluster.name">{{ atl_cluster_name }}</property>
-      <property name="confluence.cluster.home">{{ atl_product_home_shared }}</property>
-      <property name="shared-home">{{ atl_product_home_shared }}</property>
+      <property name="confluence.cluster.home">{{ atl_product_home_shared | default(confluence_shared_home) | default('') }}</property>
+      <property name="shared-home">{{ atl_product_home_shared | default(confluence_shared_home) | default('') }}</property>
 
       <property name="confluence.cluster.join.type">{{ atl_cluster_type }}</property>
       {% if atl_cluster_type == 'aws' %}
diff --git a/entrypoint.py b/entrypoint.py
index e62bc66..12ffd2b 100755
--- a/entrypoint.py
+++ b/entrypoint.py
@@ -40,10 +40,6 @@ env = {k.lower(): v
        for k, v in os.environ.items()
        if k.startswith(('ATL_', 'CONFLUENCE_', 'RUN_', 'CATALINA_'))}
 
-# For compatability with the Ansible templates.
-env['atl_product_home'] = env['confluence_home']
-env['atl_product_home_shared'] = env.get('confluence_shared_home')
-
 
 ######################################################################
 # Generate all configuration files for Confluence