Merge pull request #254 from iiab/master

sync from iiab/iiab

roles/calibre-web/defaults/main.yml

@@ -12,6 +12,8 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
+calibreweb_version: 0.6.3    # WAS: master
+
 calibreweb_venv_path: /usr/local/calibre-web
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
 

roles/calibre-web/tasks/main.yml

@@ -32,9 +32,9 @@
     repo: https://github.com/janeczku/calibre-web.git
     dest: "{{ calibreweb_venv_path }}"
     force: yes
-    #update: yes
+    #update: yes   # not needed, as Ansible's default is to update
     depth: 1
-    version: master
+    version: "{{ calibreweb_version }}"
   when: internet_available | bool
 
 ## Ansible Pip Bug: Cannot use 'chdir' with 'env' https://github.com/ansible/ansible/issues/37912 (Patch landed)

roles/calibre/tasks/debs.yml

@@ -1,9 +1,12 @@
-# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before
-# calling this script.  As of 2018-10-23 this is set in only 3 places:
+# calibre_via_debs MUST BE TRUE IN ORDER FOR roles/calibre/tasks/main.yml TO
+# INVOKE THIS SCRIPT.  As of 2019-05-30, that means these 4 OS's:
 #
-# vars/raspbian-9.yml
-# vars/raspbian-8.yml
-# vars/debian-10.yml
+# /opt/iiab/iiab/vars/raspbian-8.yml
+# /opt/iiab/iiab/vars/raspbian-9.yml
+# /opt/iiab/iiab/vars/raspbian-10.yml
+# /opt/iiab/iiab/vars/debian-10.yml
+#
+# As viewable live @ https://github.com/iiab/iiab/tree/master/vars
 
 # If you want the latest Calibre, run the appropriate script below, standalone.
 # HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!) to
@@ -44,9 +47,11 @@
 #  command: scripts/calibre-install-pinned-rpi.sh    # Worked for Calibre 3.33.1 on 2018-10-23, e.g. so IIAB microSD bootable in RPi Zero W
 #  when: is_rpi and internet_available
 
-- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
+- name: Install/Upgrade to Calibre testing .deb's (not rpi)
   command: scripts/calibre-install-latest.sh
-  when: not is_rpi and not is_ubuntu_18 and internet_available
+  when: (not is_rpi) and internet_available
+  #when: (not is_rpi) and (is_debian_9 or is_ubuntu_16) and internet_available
+  #when: not is_rpi and not is_ubuntu_18 and internet_available
 
 - name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs
   command: scripts/calibre-install-unstable.sh

roles/httpd/tasks/main.yml

@@ -23,16 +23,29 @@
   tags:
     - download
 
-- name: Install php{{ php_version }}-sqlite (debian-8)
-  package:
-    name: "php{{ php_version }}-sqlite"
-  when: is_debian and ansible_distribution_major_version == "8"
+# 2019-05-30: Irrelevant (never invoked)
+#- name: Install php{{ php_version }}-sqlite (raspbian-8 or debian-8)
+#  package:
+#    name: "php{{ php_version }}-sqlite"
+#  when: is_raspbian_8 or is_debian_8
+#  #when: is_debian and ansible_distribution_major_version == "8"
 
-# SQLite3 no longer included in another package
-- name: Install php{{ php_version }}-sqlite3 (debian-9 or ubuntu-18)
+# 2019-05-30: It's interesting that http://box.lan/admin and everything seems
+# to work even without php{{ php_version }}-sqlite3 as confirmed on Ubuntu
+# 16.04 (SEE PR #1697).  And likely all others?  @tim-moody writes "I think
+# we decided that because sqlite3 and php are part of the base install the
+# connector should be too."
+# We might *try* deprecating this here as we transition beyond {raspbian-9,
+# debian-9, ubuntu-18} in coming months to verify that roles/osm-vector-maps
+# is the only role that needs it?
+#
+# Legacy Comment: SQLite3 no longer included in another package
+- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+)
   package:
     name: "php{{ php_version }}-sqlite3"
-  when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
+  #when: is_raspbian_9 or is_debian_9 or is_ubuntu_18
+  when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16)
+  #when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
 
 - name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)'
   package:

roles/osm-vector-maps/templates/iiab-update-map

@@ -60,6 +60,9 @@ def main():
          if len(installed_maps) == 1:
             menus.update_menu_json(menu_ref)
             return
+      elif region not in map_catalog['regions']:
+          print "Skipping unknown map " + fname
+          continue
       else:
           item = map_catalog['regions'][region]
           menu_ref = item['perma_ref']