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

roles/calibre/tasks/install.yml

@@ -37,13 +37,13 @@
 
 # 2. SYSTEMD SERVICES
 
-- name: Create /etc/systemd/system/calibre-serve.service and /etc/{{ apache_conf_dir }}/calibre.conf
+- name: 'Install from template: /etc/systemd/system/calibre-serve.service'
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   with_items:
     - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service' }
-    - { src: 'calibre.conf', dest: '/etc/{{ apache_conf_dir }}' }    # apache2/sites-available (this doesn't work, see #529: let's try to create /etc/nginx/conf.d/calibre-nginx.conf in future!)
+    #- { src: 'calibre.conf', dest: '/etc/{{ apache_conf_dir }}' }    # apache2/sites-available (this doesn't work, see #529: let's try to create /etc/nginx/conf.d/calibre-nginx.conf in future!)
 
 - name: Stop service 'calibre-serve' (/usr/bin/calibre-server by Kovid Goyal)
   systemd:

roles/elgg/tasks/install.yml

@@ -107,10 +107,10 @@
     state: directory
     owner: "{{ apache_user }}"
 
-- name: Install /etc/{{ apache_conf_dir }}/elgg.conf from template, for http://box{{ elgg_url }}    # http://box/elgg
+# - name: Install /etc/{{ apache_conf_dir }}/elgg.conf from template, for http://box{{ elgg_url }}    # http://box/elgg
-  template:
+#   template:
-    src: elgg.conf
+#     src: elgg.conf
-    dest: "/etc/{{ apache_conf_dir }}/elgg.conf"
+#     dest: "/etc/{{ apache_conf_dir }}/elgg.conf"
 
 
 - name: Set up Elgg's MySQL database

roles/elgg/tasks/main.yml

@@ -24,14 +24,13 @@
   when: elgg_installed is undefined
 
 
-#- name: Enable/Disable/Restart Apache if primary
+# #- name: Enable/Disable/Restart Apache if primary
-- name: SHIM FOR NOW SO ALWAYS DO THE...Enable/Disable/Restart Apache
+# - name: SHIM FOR NOW SO ALWAYS DO THE...Enable/Disable/Restart Apache
-  include_tasks: apache.yml
+#   include_tasks: apache.yml
-  #when: not nginx_enabled
+#   #when: not nginx_enabled
 
 - name: Enable/Disable/Restart NGINX if primary
   include_tasks: nginx.yml
-  when: nginx_enabled
 
 
 - name: Add 'elgg' variable values to {{ iiab_ini_file }}

roles/internetarchive/tasks/install.yml

@@ -62,12 +62,6 @@
     src: internetarchive.service.j2
     dest: /etc/systemd/system/internetarchive.service
 
-- name: "Install from template: /etc/{{ apache_conf_dir }}/internetarchive.conf"
-  template:
-    src: internetarchive.conf
-    dest: "/etc/{{ apache_conf_dir }}/internetarchive.conf"    # apache2/sites-available
-  when: apache_installed is defined
-
 
 # 4. RECORD Internet Archive AS INSTALLED
 

roles/internetarchive/tasks/main.yml

@@ -68,13 +68,13 @@
     state: stopped
   when: not internetarchive_enabled
 
-- name: Enable/Disable/Restart Apache if primary
+# - name: Enable/Disable/Restart Apache if primary
-  include_tasks: apache.yml
+#   include_tasks: apache.yml
-  when: apache_installed is defined and not nginx_enabled
+#   when: apache_installed is defined and not nginx_enabled
 
 - name: Enable/Disable/Restart NGINX if primary
   include_tasks: nginx.yml
-  when: nginx_enabled
+  #when: nginx_enabled
 
 
 - name: Add 'internetarchive' variable values to {{ iiab_ini_file }}

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
+- name: Enable/Disable/Restart NGINX
-  include_tasks: apache.yml
-  when: not nginx_enabled
-
-- name: Enable/Disable/Restart NGINX if primary
   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