Merge pull request #371 from jvonau/target-bits

Sync from jvonau:target-bits

roles/3-base-server/tasks/main.yml

@@ -3,21 +3,24 @@
 - name: ...IS BEGINNING =====================================
   command: echo
 
-- name: HTTPD (APACHE)
+- name: HTTPD
   include_role:
     name: httpd
-  when: apache_install | bool
 
 - name: MYSQL
   include_role:
     name: mysql
   when: mysql_install | bool
 
-- name: Install NGINX (configured LATER, in Stage 9-LOCAL-ADDONS)
+- name: Install APACHE (configured LATER, in Stage 9)
+  include_tasks: roles/httpd/tasks/install.yml
+  when: apache_install | bool
+
+- name: Install NGINX (configured LATER, in Stage 9)
   include_tasks: roles/nginx/tasks/install.yml
   when: nginx_install | bool
 
-- name: Install dnsmasq
+- name: Install dnsmasq (configured LATER, in network)
   include_tasks: roles/network/tasks/dnsmasq.yml
   when: dnsmasq_install | bool
 

roles/4-server-options/tasks/main.yml

@@ -29,10 +29,10 @@
 
 # This is in Stage 4-SERVER-OPTIONS (rather than 3-BASE-SERVER) because var
 # iiab_home_url changes, and may need to be re-run in the field/offline/etc.
-- name: HOMEPAGE
+- name: HOMEPAGE under Apache
   include_role:
     name: homepage
-  # has no "when: XXXXX_install" flag
+  when: not nginx_enabled
 
 - name: CUPS
   include_role:

roles/httpd/tasks/main.yml

@@ -9,7 +9,7 @@
 #   - And that we really don't want to invoke it hereunder?
 # - Save relevant apache_* vars to /etc/iiab/iiab.ini
 
-- include_tasks: install.yml
+#- include_tasks: install.yml
 - include_tasks: html.yml
 - include_tasks: php-stem.yml