From 47f829fc3991708a8d6ac8b895328d7aed7b8f24 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 27 May 2019 15:33:05 +1000 Subject: [PATCH] DCD-352: Set home in confluence-init.properties. --- .../confluence_config/molecule/default/tests/test_default.py | 5 +++++ roles/confluence_config/tasks/main.yml | 5 +++++ .../templates/confluence-init.properties.j2 | 1 + 3 files changed, 11 insertions(+) create mode 100644 roles/confluence_config/templates/confluence-init.properties.j2 diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py index 90e9293..0d1630c 100644 --- a/roles/confluence_config/molecule/default/tests/test_default.py +++ b/roles/confluence_config/molecule/default/tests/test_default.py @@ -11,6 +11,11 @@ def test_seraph_file(host): assert f.exists assert f.contains('COOKIEAGE') +def test_conf_init_file(host): + f = host.file('/opt/atlassian/confluence/current/confluence/WEB-INF/classes/confluence-init.properties') + assert f.exists + assert f.contains('confluence.home = /var/atlassian/application-data/confluence') + def test_setenv_file(host): f = host.file('/opt/atlassian/confluence/current/bin/setenv.sh') assert f.exists diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index 2be0221..f87bfdb 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -40,6 +40,11 @@ src: seraph-config.xml.j2 dest: "{{ atl_product_installation_versioned }}/confluence/WEB-INF/classes/seraph-config.xml" +- name: Configure Confluence home directory + template: + src: confluence-init.properties.j2 + dest: "{{ atl_product_installation_versioned }}/confluence/WEB-INF/classes/confluence-init.properties" + - name: Create Confluence configuration template: src: confluence.cfg.xml.j2 diff --git a/roles/confluence_config/templates/confluence-init.properties.j2 b/roles/confluence_config/templates/confluence-init.properties.j2 new file mode 100644 index 0000000..b2ecc60 --- /dev/null +++ b/roles/confluence_config/templates/confluence-init.properties.j2 @@ -0,0 +1 @@ +confluence.home = {{ atl_product_home }}