Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCD-545: Move fallback home vars to templates.

Browse Source
This commit is contained in:
Steve Smith 2019-08-15 14:29:18 +10:00
parent dfc0559d7a
commit 77f4b2bfd0
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/confluence-init.properties.j2
View File

@ -1 +1 @@
confluence.home = {{ atl_product_home }} confluence.home = {{ atl_product_home | default(confluence_home) | default('') }}

4
config/confluence.cfg.xml.j2
View File

@ -39,8 +39,8 @@
{% if atl_cluster_type is defined %} {% if atl_cluster_type is defined %}
<property name="confluence.cluster">true</property> <property name="confluence.cluster">true</property>
<property name="confluence.cluster.name">{{ atl_cluster_name }}</property> <property name="confluence.cluster.name">{{ atl_cluster_name }}</property>
<property name="confluence.cluster.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 }}</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> <property name="confluence.cluster.join.type">{{ atl_cluster_type }}</property>
{% if atl_cluster_type == 'aws' %} {% if atl_cluster_type == 'aws' %}

4
entrypoint.py
View File

@ -40,10 +40,6 @@ env = {k.lower(): v
for k, v in os.environ.items() for k, v in os.environ.items()
if k.startswith(('ATL_', 'CONFLUENCE_', 'RUN_', 'CATALINA_'))} 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 # Generate all configuration files for Confluence