diff --git a/roles/domain/templates/pam_mount.conf.xml b/roles/domain/templates/pam_mount.conf.xml index 0e39b65..8e15907 100644 --- a/roles/domain/templates/pam_mount.conf.xml +++ b/roles/domain/templates/pam_mount.conf.xml @@ -14,10 +14,10 @@ processed in a single pass from top-to-bottom <!-- Volume definitions --> <volume user="*" sgrp="domain users" fstype="cifs" server="{{ ansible_local.domain.server }}" path="%(USER)" mountpoint="~" - options="iocharset=utf8,file_mode=0644,dir_mode=0755,cache=strict" /> + options="acl,user_xattr,iocharset=utf8,file_mode=0644,dir_mode=0755,cache=strict" /> <volume user="*" sgrp="domain users" fstype="cifs" server="{{ ansible_local.domain.server }}" path="shared" mountpoint="~/Condiviso" - options="iocharset=utf8,file_mode=0664,dir_mode=0775,cache=strict" /> + options="acl,user_xattr,iocharset=utf8,file_mode=0664,dir_mode=0775,cache=strict" /> <!-- pam_mount parameters: General tunables --> <!-- diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml index 2311db2..ade5abe 100644 --- a/roles/prereq/tasks/main.yml +++ b/roles/prereq/tasks/main.yml @@ -1,10 +1,5 @@ --- -- name: Configuring executive mirrorpath - set_fact: - execmirrorpath: "{{ ansible_local.domain.mirrorpath}}" - when: ansible_local.domain.mirror_mode == 'local' or ansible_local.domain.mirror_mode == 'nfs' - - include: prereq.yml tags: prereq diff --git a/roles/prereq/tasks/prereq.yml b/roles/prereq/tasks/prereq.yml index 5b025bb..2e42b2f 100644 --- a/roles/prereq/tasks/prereq.yml +++ b/roles/prereq/tasks/prereq.yml @@ -41,3 +41,8 @@ - name: Loading repo/pkg versions setup: filter=ansible_local + +- name: Configuring executive mirrorpath + set_fact: + execmirrorpath: "{{ ansible_local.domain.mirrorpath}}" + when: ansible_local.domain.mirror_mode == 'local' or ansible_local.domain.mirror_mode == 'nfs'