Merge pull request #975 from holta/0-init-clean

Quick cleanup or 0-init/tasks/main.yml

roles/0-init/tasks/main.yml

@@ -22,13 +22,13 @@
   setup:
     filter: ansible_local
 
-- name: Set top level variables from local facts for convenience
+- name: Set top-level variables from local_facts for convenience
   set_fact:
     xo_model: "{{ ansible_local.local_facts.xo_model }}"
     phplib_dir: "{{ ansible_local.local_facts.phplib_dir }}"
     iiab_stage: "{{ ansible_local.local_facts.stage }}"
 
-- name: Discover if this is running Raspbian -- if so assume it is a RPi
+- name: Discover if this is running Raspbian -- if so assume it is an RPi
   set_fact:
     rpi_model: "rpi"
     is_rpi: True
@@ -59,7 +59,7 @@
     gw_active: True
   when: discovered_wan_iface != "none" and gw_active_test.stdout == "1"
 
-- name: Test for internet access
+- name: Test for Internet access
   get_url:
     url: "{{ iiab_download_url }}/heart-beat.txt"
     dest: /tmp/heart-beat.txt
@@ -75,7 +75,7 @@
     internet_available: True
   when: not internet_access_test|failed and not disregard_network
 
-- name: Cleanup internet test file
+- name: Remove Internet test file
   file:
     path: /tmp/heart-beat.txt
     state: absent
@@ -103,20 +103,20 @@
 #  when: elgg_enabled or rachel_enabled or owncloud_enabled or phpmyadmin_enabled or wordpress_enabled or iiab_menu_install
 
 # Late 2017: Had commented out MongoDB on a trial basis, for a more basic/lightweight Sugarizer, per https://github.com/iiab/iiab/pull/427
-- name: Turn on mongodb if sugarizer enabled
+- name: Turn on vars for MongoDB if Sugarizer enabled
   set_fact:
      mongodb_install: True
      mongodb_enabled: True
   when: sugarizer_enabled
 
 # There might be other db's
-- name: Turn on PostgreSQL if Moodle or Pathagar enabled
+- name: Turn on vars for PostgreSQL if Moodle or Pathagar enabled
   set_fact:
     postgresql_install: True
     postgresql_enabled: True
   when: moodle_enabled or pathagar_enabled
 
-- name: Turn on Docker if SchoolTool is to be installed
+- name: Turn on vars for Docker if SchoolTool is to be installed
   set_fact:
     docker_install: True
     docker_enabled: True
@@ -161,7 +161,7 @@
     FQDN_changed: True
   when: iiab_fqdn != ansible_fqdn
 
-- name: Setting hostname
+- name: Set hostname if FQDN_changed
   include_tasks: hostname.yml
   when: FQDN_changed
 
@@ -209,9 +209,9 @@
     - option: FQDN_changed
       value:  "{{ FQDN_changed }}"
 
-- name: Now changing FQDN
-  include_tasks: hostname.yml
-  when: FQDN_changed
+#- name: Now changing FQDN
+#  include_tasks: hostname.yml
+#  when: FQDN_changed
 
 - name: STAGE 0 HAS COMPLETED ======================================
   ini_file: