Merge pull request #117 from iiab/master

sync from iiab/iiab

iiab-install

@@ -10,7 +10,7 @@ CWD=`pwd`
 OS=`grep ^ID= /etc/*release|cut -d= -f2`
 OS=${OS//\"/}
 MIN_RPI_KERN=4.9.59-v7+
-MIN_ANSIBLE_VER=2.5.6
+MIN_ANSIBLE_VER=2.5.7
 
 if [ ! -f /etc/iiab/local_vars.yml ]; then
 

roles/0-init/defaults/main.yml

@@ -12,7 +12,7 @@ gw_active: none
 internet_available: False
 discovered_wan_iface: none
 
-# old defs
+# Old defs
 gui_port: 80
 exFAT_enabled: False
 is_F18: False
@@ -21,12 +21,12 @@ is_F18: False
 rtc_id: ds3231
 NUC6_firmware_needed: False
 
-# used in 2-common/tasks/xo.yml
+# Used in 2-common/tasks/xo.yml
 wifi_id: none
 
-# used in 2-common, 3-base-server and roles/network
+# Used in 2-common, 3-base-server and roles/network
 installing: False
 
-# network
+# Network
 no_net_restart: False
 no_NM_reload: False

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:

roles/calibre/tasks/debs.yml

@@ -28,8 +28,8 @@
 #  when: is_rpi and internet_available
 
 - name: Upgrade to latest Calibre using .deb's from testing (rpi)
-  command: scripts/calibre-install-latest-rpi-plus.sh    # HOPE IT WORKS FOR Calibre 3.27.1+ starting 2018-07-22 -- PLEASE TEST IF BOOTABLE IN Zero W?
-  #command: scripts/calibre-install-latest-rpi.sh    # WORKED FOR Calibre 3.26.x (Calibre 3.24.x & 3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in Zero W)
+  #command: scripts/calibre-install-latest-rpi-plus.sh    # NEC FOR Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952).  Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh
+  command: scripts/calibre-install-latest-rpi.sh    # WORKS for Calibre 3.28 on 2018-07-26 (PR #971).  Likewise for Calibre 3.26.x
   when: is_rpi and internet_available
 
 - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)