diff --git a/roles/restore_backups/molecule/restore/playbook.yml b/roles/restore_backups/molecule/restore/playbook.yml index a2b36ea..073d24b 100644 --- a/roles/restore_backups/molecule/restore/playbook.yml +++ b/roles/restore_backups/molecule/restore/playbook.yml @@ -46,16 +46,19 @@ file: path: "{{ test_archive_source }}" state: directory + mode: 0755 - name: "{{ test_pre_step_prefix }} Create a file in the shared home" lineinfile: create: yes line: 'Hello, world!' path: "{{ test_archive_source }}/{{ test_archive_file }}" + mode: 0640 - name: "{{ test_pre_step_prefix }} Create the version file in the shared home" lineinfile: create: yes line: '8.5' path: "{{ test_product_version_file }}" + mode: 0640 - name: "{{ test_pre_step_prefix }} Archive the shared home" archive: path: diff --git a/roles/restore_backups/molecule/restore/tests/test_default.py b/roles/restore_backups/molecule/restore/tests/test_default.py index 98af566..c9882bc 100644 --- a/roles/restore_backups/molecule/restore/tests/test_default.py +++ b/roles/restore_backups/molecule/restore/tests/test_default.py @@ -1,5 +1,6 @@ import os import pytest +from stat import * import testinfra.utils.ansible_runner @@ -29,6 +30,10 @@ def test_shared_home_owner(host, file): assert host.file(file).user == 'jira' assert host.file(file).group == 'jira' +def test_file_modes(host): + assert host.file('/media/atl/jira/shared/hello').mode == 0o755 + assert host.file('/media/atl/jira/shared/hello/hello.txt').mode == 0o640 + def test_version_file_owned_by_root(host): assert host.file('/media/atl/jira/shared/jira-software.version').exists assert host.file('/media/atl/jira/shared/jira-software.version').user == 'root' diff --git a/roles/restore_backups/tasks/home_restore.yml b/roles/restore_backups/tasks/home_restore.yml index bdeb866..4c5f2ad 100644 --- a/roles/restore_backups/tasks/home_restore.yml +++ b/roles/restore_backups/tasks/home_restore.yml @@ -18,7 +18,6 @@ src: "{{ atl_backup_home_dest }}" remote_src: yes dest: "{{ atl_product_home_shared }}" - mode: preserve - name: Set shared home owner and group to application user file: