external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

usb_lib/tasks/install.yml: Resolve merge conflict w/ PR #3919

Browse source
This commit is contained in:
root 2025-01-27 20:17:44 -05:00
commit f5e2f4ad79
9 changed files with 88 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/usb_lib/tasks/install.yml
View file

@ -67,7 +67,7 @@
group: "{{ apache_user }}" # 2020-02-13: changed from iiab_admin_user, after discussion on weekly call (#1228, #2222)
mode: 0775
- name: 'Install from template: /etc/udev/rules.d/usbmount.rules, /etc/systemd/system/usbmount@.service, /usr/bin/iiab-usb_lib-show-all-on, /usr/bin/iiab-usb_lib-show-all-off, /usr/sbin/iiab-clean-usb.sh'
- name: 'Install from template: /etc/udev/rules.d/usbmount.rules, /etc/systemd/system/usbmount@.service, /usr/sbin/iiab-clean-usb.sh'
template:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
@ -75,8 +75,6 @@
with_items:
- { src: 'usbmount.rules.j2', dest: '/etc/udev/rules.d/usbmount.rules', mode: '0644' }
- { src: 'usbmount@.service.j2', dest: '/etc/systemd/system/usbmount@.service', mode: '0644' }
- { src: 'iiab-usb_lib-show-all-on', dest: '/usr/bin/', mode: '0755' }
- { src: 'iiab-usb_lib-show-all-off', dest: '/usr/bin/', mode: '0755' }
- { src: 'iiab-clean-usb.sh', dest: '/usr/sbin/', mode: '0755' }
- name: '2025-01-05: Add upload2usb app (#3875) directory to doc_root'
@ -87,10 +85,10 @@
group: "{{ apache_user }}"
mode: 0755
- name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload/ to upload2usb'
- name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload/ into {{ doc_root }}/upload2usb/'
copy:
src: "{{ item }}"
dest: "{{ doc_root }}/upload2usb" # /library/www/html
dest: "{{ doc_root }}/upload2usb/" # /library/www/html
with_fileglob:
- upload/*

32
roles/usb_lib/tasks/nginx.yml
View file

@ -1,20 +1,21 @@
- name: Install /etc/usbmount/mount.d/70-usb-library from template, if usb_lib_enabled
template:
src: mount.d/70-usb-library
dest: /etc/usbmount/mount.d/
src: mount.d/70-usb-library.j2
dest: /etc/usbmount/mount.d/70-usb-library
owner: root
group: root
mode: '0751'
when: usb_lib_enabled
- name: Install /etc/usbmount/umount.d/70-usb-library from template, if usb_lib_enabled
template:
src: umount.d/70-usb-library
dest: /etc/usbmount/umount.d
owner: root
group: root
mode: '0751'
when: usb_lib_enabled
# 20250125: commenting out stale file, superseded by iiab-clean-usb.sh
# - name: Install /etc/usbmount/umount.d/70-usb-library from template, if usb_lib_enabled
# template:
# src: umount.d/70-usb-library
# dest: /etc/usbmount/umount.d
# owner: root
# group: root
# mode: '0751'
# when: usb_lib_enabled
- name: Remove /etc/usbmount/mount.d/70-usb-library if not usb_lib_enabled
file:
@ -22,11 +23,12 @@
state: absent
when: not usb_lib_enabled
- name: Remove /etc/usbmount/umount.d/70-usb-library if not usb_lib_enabled
file:
path: /etc/usbmount/umount.d/70-usb-library
state: absent
when: not usb_lib_enabled
# 20250125: commenting out stale file, superseded by iiab-clean-usb.sh
# - name: Remove /etc/usbmount/umount.d/70-usb-library if not usb_lib_enabled
# file:
# path: /etc/usbmount/umount.d/70-usb-library
# state: absent
# when: not usb_lib_enabled
- name: Restart 'nginx' systemd service
systemd: