diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml index 724d78f87..f4f6c485d 100644 --- a/roles/usb_lib/tasks/install.yml +++ b/roles/usb_lib/tasks/install.yml @@ -67,14 +67,19 @@ line: 'FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus exfat fuseblk ntfs"' path: /etc/usbmount/usbmount.conf -# Setting 'umask=0000' for partic filesystems e.g. {fat, vfat, ntfs, exfat} appears to accomplish the exact same thing: -# FS_MOUNTOPTIONS="-fstype=fat,umask=0000 -fstype=vfat,umask=0000 -fstype=ntfs,umask=0000 -fstype=exfat,umask=0000" -- name: "Add ',umask=0000' to MOUNTOPTIONS var in /etc/usbmount/usbmount.conf, so Kolibri exports work" +- name: "Set 'umask=0000' for {FAT, VFAT/FAT32, NTFS, exFAT} using var FS_MOUNTOPTIONS in /etc/usbmount/usbmount.conf, so Kolibri exports work" lineinfile: - regexp: '^MOUNTOPTIONS=.*' - line: 'MOUNTOPTIONS="sync,noexec,nodev,noatime,nodiratime,umask=0000"' + regexp: '^FS_MOUNTOPTIONS=.*' + line: 'FS_MOUNTOPTIONS="-fstype=fat,umask=0000 -fstype=vfat,umask=0000 -fstype=ntfs,umask=0000 -fstype=exfat,umask=0000"' path: /etc/usbmount/usbmount.conf +# Setting 'umask=0000' for all filesystems: (accomplishes the same thing as above) +#- name: "Add ',umask=0000' to MOUNTOPTIONS var in /etc/usbmount/usbmount.conf, so Kolibri exports work" +# lineinfile: +# regexp: '^MOUNTOPTIONS=.*' +# line: 'MOUNTOPTIONS="sync,noexec,nodev,noatime,nodiratime,umask=0000"' +# path: /etc/usbmount/usbmount.conf + - name: Install /etc/{{ apache_conf_dir }}/content_dir.conf from template template: src: content_dir.conf