From 02050f3898e65a75d41ad871ce445993ac129a51 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 25 Mar 2021 13:09:01 -0400 Subject: [PATCH] New var usb_lib_umask0000_for_kolibri --- roles/usb_lib/defaults/main.yml | 4 ++++ roles/usb_lib/tasks/install.yml | 1 + vars/default_vars.yml | 3 +++ vars/local_vars_big.yml | 3 +++ vars/local_vars_medical.yml | 1 + vars/local_vars_medium.yml | 3 +++ vars/local_vars_min.yml | 3 +++ 7 files changed, 18 insertions(+) diff --git a/roles/usb_lib/defaults/main.yml b/roles/usb_lib/defaults/main.yml index fdfd389cc..2a4b19308 100644 --- a/roles/usb_lib/defaults/main.yml +++ b/roles/usb_lib/defaults/main.yml @@ -4,5 +4,9 @@ # Show entire contents of USB sticks/drives (at http://box/usb) # iiab_usb_lib_show_all: True +# Set umask=0000 for VFAT, NTFS and exFAT in /etc/usbmount/usbmount.conf so +# Kolibri can export & import channels to USB sticks/drive: +# usb_lib_umask0000_for_kolibri: True + # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml index 9a7081f04..8e897a720 100644 --- a/roles/usb_lib/tasks/install.yml +++ b/roles/usb_lib/tasks/install.yml @@ -75,6 +75,7 @@ regexp: '^FS_MOUNTOPTIONS=.*' line: 'FS_MOUNTOPTIONS="-fstype=vfat,umask=0000 -fstype=ntfs,umask=0000 -fstype=exfat,umask=0000"' path: /etc/usbmount/usbmount.conf + when: usb_lib_umask0000_for_kolibri # 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" diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 8dc0ddc90..9690ba595 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -316,6 +316,9 @@ usb_lib_install: True usb_lib_enabled: True # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True +# Set umask=0000 for VFAT, NTFS and exFAT in /etc/usbmount/usbmount.conf so +# Kolibri can export & import channels to USB sticks/drive: +usb_lib_umask0000_for_kolibri: True # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) nodocs: False diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index e33de6fa1..3c244b915 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -203,6 +203,9 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True +# Set umask=0000 for VFAT, NTFS and exFAT in /etc/usbmount/usbmount.conf so +# Kolibri can export & import channels to USB sticks/drive: +usb_lib_umask0000_for_kolibri: True # 5-XO-SERVICES diff --git a/vars/local_vars_medical.yml b/vars/local_vars_medical.yml index c9f5c68bf..3486b4f83 100644 --- a/vars/local_vars_medical.yml +++ b/vars/local_vars_medical.yml @@ -13,6 +13,7 @@ munin_enabled: True vnstat_install: True vnstat_enabled: True openvpn_handle: "Medical IIAB - Put Your Name Here" +usb_lib_umask0000_for_kolibri: False # By default # kiwix # awstats diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 710dfbf17..887b0a165 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -203,6 +203,9 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True +# Set umask=0000 for VFAT, NTFS and exFAT in /etc/usbmount/usbmount.conf so +# Kolibri can export & import channels to USB sticks/drive: +usb_lib_umask0000_for_kolibri: True # 5-XO-SERVICES diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 023139f29..10dab276c 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -203,6 +203,9 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True +# Set umask=0000 for VFAT, NTFS and exFAT in /etc/usbmount/usbmount.conf so +# Kolibri can export & import channels to USB sticks/drive: +usb_lib_umask0000_for_kolibri: True # 5-XO-SERVICES