From cd714402bfea95edbe3433c40f2719960bdb1b45 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Thu, 21 May 2020 18:07:51 +0000
Subject: [PATCH] Install apache2 at end of 9-local-addons if
 admin_console_install: True (TEMPORARY)

---
 roles/9-local-addons/tasks/main.yml | 32 ++++-------------------------
 vars/default_vars.yml               |  6 +++---
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
index 00f7712dd..eccf86b7c 100644
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@@ -30,34 +30,10 @@
     name: calibre-web
   when: calibreweb_install | bool
 
-# Could split these two below to Stage 10?  2020-02-12: Experimentally moving
-# stuff to roles/3-base-server, 4-server-options, roles/httpd, roles/nginx.
-
-# - name: "Set 'nginx_enabled: True'"
-#   set_fact:
-#     nginx_enabled: True
-#
-# - name: Fully Enable / Configure NGINX (already installed in Stage 3-BASE-SERVER) if 'nginx_enabled' is True
-#   include_role:
-#     name: nginx
-#   when: nginx_enabled | bool    # WAS: nginx_install
-# # If just CONFIGURING (etc) shouldn't we use one of the following instead ??
-# # include_tasks: roles/nginx/tasks/setup.yml
-# # include_tasks: roles/nginx/tasks/enable.yml
-
-# - name: "Set 'apache_enabled: True'"
-#   set_fact:
-#     apache_enabled: True
-#
-# - name: Fully Enable / Configure Apache systemd service ({{ apache_service }}) if 'apache_enabled' is True
-#   include_role:
-#     name: httpd
-#     #name: httpd-enable
-#   when: apache_enabled | bool    # WAS: apache_install
-# # WARNING THAT APACHE IS AUTO-ENABLED BY THESE ~6 APPS ALONE!
-# # https://github.com/holta/iiab/blob/scaff2/roles/0-init/tasks/main.yml#L40-L44
-# # Summarized @ https://github.com/iiab/iiab/blob/master/roles/nginx/README.md
-# # 2020-01-23: APACHE FUTURE SUMMARY QUESTIONS @ roles/httpd/tasks/main.yml
+- name: '2020-05-21: TEMPORARILY INSTALL APACHE UNTIL ADMIN CONSOLE DECLARES (OR REMOVES?) ITS DEPENDENCY within [console : Enable ssl] to avoid error "Neither of apache2ctl nor apachctl found. At least one apache control binary is necessary." -- possibly var adm_cons_force_ssl is still useful here?'
+  package:
+    name: apache2
+  when: admin_console_install | bool
 
 - name: Recording STAGE 9 HAS COMPLETED ====================
   lineinfile:
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 2d0ed6446..e5ad0bc0f 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -229,9 +229,9 @@ pi_swap_file_size: 1024
 
 # 3-BASE-SERVER
 
-# 2020-01-22: Both vars unused.  SEE ABOVE js_menu_install.
-admin_console_install: True
-admin_console_enabled: True
+# 2020-01-22: See also js_menu_install (above).
+admin_console_install: True    # For now in roles/9-local-addons/tasks/main.yml
+admin_console_enabled: True    # Not in active use as of 2020-05-21
 
 # MySQL MANDATORY - THESE 2 VARS HAVE NO EFFECT - SEE roles/0-init/tasks/main.yml & roles/mysql/tasks/main.yml
 mysql_install: True