Update main.yml

roles/usb-lib/tasks/main.yml

@@ -1,12 +1,12 @@
-- name: Add a content directory for links to be located
+- name: Add dir {{ doc_root }}/local_content, where USB drive links can appear
   file:
-    dest: "{{ doc_root }}/local_content"
+    path: "{{ doc_root }}/local_content"
     state: directory
     owner: "{{ apache_user }}"
     group: "{{ iiab_admin_user }}"    # ISN'T "{{ apache_user }}" MORE APPROPRIATE?
     mode: 0775
 
-- name: Copy mount file to usbmount when enabled
+- name: Install /etc/usbmount/mount.d/70-usb-library from template
   template:
     src: mount.d/70-usb-library
     dest: /etc/usbmount/mount.d/
@@ -15,7 +15,7 @@
     mode: 0751
   when: usb_lib_enabled
 
-- name: Install udev to systemd link -> usbmount
+- 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'
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -26,13 +26,13 @@
     - { src: 'iiab-usb-lib-show-all-on' , dest: '/usr/bin/', mode: '0755' }
     - { src: 'iiab-usb-lib-show-all-off' , dest: '/usr/bin/', mode: '0755' }
 
-- name: Enable exFAT and NTFS
+- name: Enable exFAT and NTFS in /etc/usbmount/usbmount.conf
   lineinfile: 
     regexp: '^FILESYSTEMS.*'
     line: 'FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus exfat fuseblk ntfs"'
-    dest: /etc/usbmount/usbmount.conf
+    path: /etc/usbmount/usbmount.conf
 
-- name: Copy umount file to usbmount when enabled
+- name: Install /etc/usbmount/umount.d/70-usb-library from template
   template:
     src: umount.d/70-usb-library
     dest: /etc/usbmount/umount.d
@@ -41,13 +41,13 @@
     mode: 0751
   when: usb_lib_enabled
 
-- name: Remove mount file to usbmount when not enabled
+- name: Remove /etc/usbmount/mount.d/70-usb-library if not usb_lib_enabled
   file:
     path: /etc/usbmount/mount.d/70-usb-library
     state: absent
   when: not usb_lib_enabled
 
-- name: Remove umount file to usbmount when not 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
@@ -55,37 +55,36 @@
 
 - name: Put variable in iiab.env that enables display of content at root of USB
   lineinfile:
-    dest: "{{ iiab_env_file }}"
+    path: "{{ iiab_env_file }}"
     regexp: "^IIAB_USB_LIB_SHOW_ALL.*"
     line: "IIAB_USB_LIB_SHOW_ALL={{ iiab_usb_lib_show_all }}"
 
-- name: Add Apache config for content directory
+- name: Install /etc/{{ apache_config_dir }}/content_dir.conf from template
   template:
     src: content_dir.conf
     dest: "/etc/{{ apache_config_dir }}"
   when: usb_lib_enabled
 
-- name: Create the link to enable (debuntu)
+- name: Create symlink content_dir.conf from sites-enabled to sites-available (debuntu)
   file:
     src: "/etc/{{ apache_config_dir }}/content_dir.conf"
     dest: /etc/apache2/sites-enabled/content_dir.conf
     state: link
   when: is_debuntu
 
-- name: Remove the link that enables (debuntu)
+- name: Remove symlink content_dir.conf from /etc/apache2/sites-enabled (debuntu)
   file:
-    src: "/etc/{{ apache_config_dir }}/content_dir.conf"
     dest: /etc/apache2/sites-enabled/content_dir.conf
     state: absent
   when: is_debuntu and not usb_lib_enabled
 
-- name: Remove Apache config for content directory
+- name: Remove content_dir.conf from /etc/{{ apache_config_dir }}
   file:
     name: "/etc/{{ apache_config_dir }}/content_dir.conf"
     state: absent
   when: not usb_lib_enabled
 
-- name: Add usb-lib to service list
+- name: Add 'usb-lib' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: usb-lib