mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	No need for a re-install to edit files & record usb_lib_umask0000_for_kolibri
This commit is contained in:
		
							parent
							
								
									a8cd73a386
								
							
						
					
					
						commit
						34228b66d7
					
				
					 2 changed files with 24 additions and 23 deletions
				
			
		| 
						 | 
				
			
			@ -76,29 +76,6 @@
 | 
			
		|||
    line: 'FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus exfat fuseblk ntfs"'
 | 
			
		||||
    path: /etc/usbmount/usbmount.conf
 | 
			
		||||
 | 
			
		||||
- name: "Set 'umask=0000' for {VFAT/FAT32, NTFS, exFAT} using var FS_MOUNTOPTIONS in /etc/usbmount/usbmount.conf, so Kolibri exports work"
 | 
			
		||||
  lineinfile:
 | 
			
		||||
    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: (much the same thing as above, as
 | 
			
		||||
# the mount command does not use this umask setting for filesystems like ext4)
 | 
			
		||||
#- 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
 | 
			
		||||
#  when: usb_lib_umask0000_for_kolibri
 | 
			
		||||
 | 
			
		||||
- name: 'Set FS_MOUNTOPTIONS="" in /etc/usbmount/usbmount.conf, e.g. if Kolibri will not be used'
 | 
			
		||||
  lineinfile:
 | 
			
		||||
    regexp: '^FS_MOUNTOPTIONS=.*'
 | 
			
		||||
    line: 'FS_MOUNTOPTIONS=""'    # Restore apt pkg default, if runrole forced
 | 
			
		||||
    path: /etc/usbmount/usbmount.conf
 | 
			
		||||
  when: not usb_lib_umask0000_for_kolibri
 | 
			
		||||
 | 
			
		||||
# 2021-03-25: Consider removing this stanza & all of this role's Apache logic!
 | 
			
		||||
- name: Install /etc/{{ apache_conf_dir }}/content_dir.conf from template
 | 
			
		||||
  template:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,6 +29,28 @@
 | 
			
		|||
  include_tasks: install.yml
 | 
			
		||||
  when: usb_lib_installed is undefined
 | 
			
		||||
 | 
			
		||||
- name: "Set 'umask=0000' for {VFAT/FAT32, NTFS, exFAT} using var FS_MOUNTOPTIONS in /etc/usbmount/usbmount.conf, so Kolibri exports work"
 | 
			
		||||
  lineinfile:
 | 
			
		||||
    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: (much the same thing as above, as
 | 
			
		||||
# the mount command does not use this umask setting for filesystems like ext4)
 | 
			
		||||
#- 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
 | 
			
		||||
#  when: usb_lib_umask0000_for_kolibri
 | 
			
		||||
 | 
			
		||||
- name: 'Set FS_MOUNTOPTIONS="" in /etc/usbmount/usbmount.conf, e.g. if Kolibri will not be used'
 | 
			
		||||
  lineinfile:
 | 
			
		||||
    regexp: '^FS_MOUNTOPTIONS=.*'
 | 
			
		||||
    line: 'FS_MOUNTOPTIONS=""'    # Restore apt pkg default, if runrole forced
 | 
			
		||||
    path: /etc/usbmount/usbmount.conf
 | 
			
		||||
  when: not usb_lib_umask0000_for_kolibri
 | 
			
		||||
 | 
			
		||||
- name: Enable/Disable/Restart Apache if primary
 | 
			
		||||
  include_tasks: apache.yml
 | 
			
		||||
| 
						 | 
				
			
			@ -60,3 +82,5 @@
 | 
			
		|||
      value: "{{ usb_lib_install }}"
 | 
			
		||||
    - option: usb_lib_enabled
 | 
			
		||||
      value: "{{ usb_lib_enabled }}"
 | 
			
		||||
    - option: usb_lib_umask0000_for_kolibri
 | 
			
		||||
      value: "{{ usb_lib_umask0000_for_kolibri }}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue