From d1cb3ff9219388b952bd7d06366a301aeefe717b Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 10 Apr 2019 18:03:35 +0200 Subject: [PATCH] Move the tasks that setup the ACLs in separate blocks. --- .../tasks/common-users-data-dirs.yml | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/user_services_perms/tasks/common-users-data-dirs.yml b/user_services_perms/tasks/common-users-data-dirs.yml index 2fc69b4..4d13f9a 100644 --- a/user_services_perms/tasks/common-users-data-dirs.yml +++ b/user_services_perms/tasks/common-users-data-dirs.yml @@ -28,14 +28,6 @@ with_items: '{{ additional_data_directories }}' when: item.create and not item.file - - name: Set the read/write/access permissions on the users additional data dirs - acl: name={{ item.name }} entity={{ common_users_group }} etype=group permissions={{ item.aclperms | default('rwX') }} state=present recursive=yes - with_items: '{{ additional_data_directories | default([]) }}' - - - name: Set the default read/write/access permissions on the users additional data dirs - acl: name={{ item.name }} entity={{ common_users_group }} etype=group permissions={{ item.aclperms | default('rwX') }} state=present default=yes recursive=yes - with_items: '{{ additional_data_directories | default([]) }}' - when: additional_data_directories is defined tags: [ 'users', 'users_acl' ] @@ -45,6 +37,23 @@ with_items: '{{ additional_data_directories_adjunct }}' when: item.create and not item.file + when: additional_data_directories_adjunct is defined + tags: [ 'users', 'users_acl' ] + + +- block: + - name: Set the read/write/access permissions on the users additional data dirs + acl: name={{ item.name }} entity={{ common_users_group }} etype=group permissions={{ item.aclperms | default('rwX') }} state=present recursive=yes + with_items: '{{ additional_data_directories | default([]) }}' + + - name: Set the default read/write/access permissions on the users additional data dirs + acl: name={{ item.name }} entity={{ common_users_group }} etype=group permissions={{ item.aclperms | default('rwX') }} state=present default=yes recursive=yes + with_items: '{{ additional_data_directories | default([]) }}' + + when: additional_data_directories is defined + tags: [ 'users_acl' ] + +- block: - name: Set the read/write/access permissions on the additional data dirs acl: name={{ item.name }} entity={{ common_users_group }} etype=group permissions={{ item.aclperms | default('rwX') }} state=present recursive=yes with_items: '{{ additional_data_directories_adjunct }}' @@ -54,5 +63,5 @@ with_items: '{{ additional_data_directories_adjunct }}' when: additional_data_directories_adjunct is defined - tags: [ 'users', 'users_acl' ] + tags: [ 'users_acl' ]