Move the tasks that setup the ACLs in separate blocks.

This commit is contained in:
Andrea Dell'Amico 2019-04-10 18:03:35 +02:00
parent 2831ead215
commit d1cb3ff921
1 changed files with 18 additions and 9 deletions

View File

@ -28,14 +28,6 @@
with_items: '{{ additional_data_directories }}' with_items: '{{ additional_data_directories }}'
when: item.create and not item.file 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 when: additional_data_directories is defined
tags: [ 'users', 'users_acl' ] tags: [ 'users', 'users_acl' ]
@ -45,6 +37,23 @@
with_items: '{{ additional_data_directories_adjunct }}' with_items: '{{ additional_data_directories_adjunct }}'
when: item.create and not item.file 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 - 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 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 }}' with_items: '{{ additional_data_directories_adjunct }}'
@ -54,5 +63,5 @@
with_items: '{{ additional_data_directories_adjunct }}' with_items: '{{ additional_data_directories_adjunct }}'
when: additional_data_directories_adjunct is defined when: additional_data_directories_adjunct is defined
tags: [ 'users', 'users_acl' ] tags: [ 'users_acl' ]