From 0a716a29ed8ec3ccb1ca6a2bad9c04f2d8199d55 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 27 Nov 2019 11:59:00 +1100 Subject: [PATCH] DCD-791: Make linter happy and add symlink test. --- .../molecule/default/tests/test_default.py | 10 ++++++++++ roles/confluence_config/tasks/main.yml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py index a8d3013..16c0a94 100644 --- a/roles/confluence_config/molecule/default/tests/test_default.py +++ b/roles/confluence_config/molecule/default/tests/test_default.py @@ -16,6 +16,16 @@ def test_conf_init_file(host): assert f.exists assert f.contains('confluence.home = /var/atlassian/application-data/confluence') +def test_conf_attachment_symlinks(host): + assert host.file('/var/atlassian/application-data/confluence').is_directory + assert host.file('/media/atl/confluence/shared-home/attachments/').is_directory + + f = host.file('/var/atlassian/application-data/confluence/attachments') + assert f.is_symlink and f.linked_to == '/media/atl/confluence/shared-home/attachments' + + f = host.file('/var/atlassian/application-data/confluence/shared-home') + assert f.is_symlink and f.linked_to == '/media/atl/confluence/shared-home' + 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 55b8541..80473c8 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -27,8 +27,8 @@ group: "{{ atl_product_user }}" vars: - links: - - ["{{ atl_product_home_shared }}/", "{{ atl_product_home }}/shared-home"] - - ["{{ atl_product_home_shared }}/attachments/", "{{ atl_product_home }}/attachments"] + - ["{{ atl_product_home_shared }}/", "{{ atl_product_home }}/shared-home"] + - ["{{ atl_product_home_shared }}/attachments/", "{{ atl_product_home }}/attachments"] with_nested: - "{{ links }}"