Chemo: Less Apache in calibre, elgg, internetarchive, usb_lib

roles/usb_lib/tasks/install.yml

@@ -47,13 +47,13 @@
     state: present
   when: is_ubuntu
 
-- name: Add dir {{ doc_root }}/local_content, where USB drive links can appear
+- name: Add dir {{ doc_root }}/local_content, where USB drive links can appear (0775)
   file:
     state: directory
     path: "{{ doc_root }}/local_content"
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"    # 2020-02-13: changed from iiab_admin_user, after discussion on weekly call (#1228, #2222)
-    mode: '0775'
+    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'
   template:
@@ -81,13 +81,6 @@
     path: /etc/usbmount/mount.d/00_create_model_symlink
     state: absent
 
-# 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:
-    src: content_dir.conf
-    dest: "/etc/{{ apache_conf_dir }}"    # apache2/sites-available on debuntu
-  when: apache_installed is defined
-
 
 # RECORD 'USB_LIB' AS INSTALLED
 

roles/usb_lib/tasks/main.yml

@@ -56,13 +56,9 @@
   when: not usb_lib_umask0000_for_kolibri
 
 
-- name: Enable/Disable/Restart Apache if primary
-  include_tasks: apache.yml
-  when: not nginx_enabled
-
-- name: Enable/Disable/Restart NGINX if primary
+- name: Enable/Disable/Restart NGINX
   include_tasks: nginx.yml
-  when: nginx_enabled
+
 
 # 2021-04-29: Clean up here to catch the already installed users, remove for the next release (PR #2760)
 - name: Remove /etc/usbmount/mount.d/00_create_model_symlink