diff --git a/roles/fvs-mount/tasks/main.yml b/roles/fvs-mount/tasks/main.yml index 3933616..c88df14 100644 --- a/roles/fvs-mount/tasks/main.yml +++ b/roles/fvs-mount/tasks/main.yml @@ -11,6 +11,14 @@ blockinfile: dest: /etc/security/pam_mount.conf.xml block: | + <volume + fstype="fuse" + path="sshfs#%(USER)@{{ home_server }}:" + mountpoint="/home/%(USER)" + options="allow_other,default_permissions,reconnect,password_stdin,disable-hardlink" + ssh="0" noroot="0" + ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume> + <volume fstype="cifs" server="{{ smb_server }}" @@ -18,6 +26,7 @@ mountpoint="/media/%(USER)/winhome" options="dir_mode=0750,file_mode=0640" ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume> + <volume fstype="cifs" server="{{ smb_server }}" @@ -25,13 +34,6 @@ mountpoint="/media/%(USER)/winshare" options="dir_mode=0750,file_mode=0640" ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume> - <volume - fstype="fuse" - path="sshfs#%(USER)@{{ home_server }}:" - mountpoint="/home/%(USER)" - options="allow_other,default_permissions,reconnect,password_stdin" - ssh="0" noroot="0" - ><not><or><user>ansible</user><user>Debian-gdm</user></or></not></volume> insertafter: "<!-- Volume definitions -->" - name: make sure .ssh exists