From af255b56be961d35886140a6d40f2c0d6557d148 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Jan 2020 09:08:02 -0500 Subject: [PATCH 1/5] Revert #2160 in kalite/tasks/install.yml --- roles/kalite/tasks/install.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 86c3f19d6..cd2f4849b 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -6,10 +6,11 @@ timeout: "{{ download_timeout }}" when: internet_available | bool -- name: Run 'mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139' as "TEMPORARY" workaround (2020-01-17) for piwheels.org's setuptools Python 2/3 brokenness on RPi (https://github.com/iiab/iiab/issues/2139) - command: mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139 - ignore_errors: yes - when: is_rpi | bool +# 2020-01-19: https://github.com/piwheels/packages/issues/74 says the following is not longer needed... +#- name: Run 'mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139' as "TEMPORARY" workaround (2020-01-17) for piwheels.org's setuptools Python 2/3 brokenness on RPi (https://github.com/iiab/iiab/issues/2139) +# command: mv /etc/pip.conf /etc/pip.conf.see-iiab-issue-2139 +# ignore_errors: yes +# when: is_rpi | bool #- name: Install KA Lite non-static + reqs file with pip - (debuntu) # pip: requirements={{ pip_packages_dir }}/kalite.txt From 0b791b287893483bda719d936213727e1874993c Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 Jan 2020 23:00:06 -0500 Subject: [PATCH 2/5] calibreweb_version: master -> 0.6.5 --- roles/calibre-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml index 7a5085951..689808dec 100644 --- a/roles/calibre-web/defaults/main.yml +++ b/roles/calibre-web/defaults/main.yml @@ -14,7 +14,7 @@ # 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: master # WAS: master, 0.6.4 +calibreweb_version: 0.6.5 # WAS: master, 0.6.4 calibreweb_venv_path: /usr/local/calibre-web calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py" From 0dd8ef62b1fc91934f6d2565eb381327e4582a1f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 20 Jan 2020 22:23:43 -0500 Subject: [PATCH 3/5] Recommend Ansible 2.9.4 --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 44ccea0c5..7b3c1123b 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.4" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From ce6674619ab8844ec6e330d09c9643af9bfd0dbd Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 20 Jan 2020 22:24:05 -0500 Subject: [PATCH 4/5] Recommend Ansible 2.9.4 --- scripts/ansible-2.9.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index f2cd54985..3ee947586 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.4" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From 44836bc1daa9d1119faf0d14ad72b9f4b344f86d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 21 Jan 2020 00:16:45 -0500 Subject: [PATCH 5/5] Lokole 0.5.4 -> 0.5.5 --- roles/lokole/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index 60950a0ee..fd5ae2851 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -5,7 +5,7 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # Info needed to install Lokole -lokole_version: 0.5.4 +lokole_version: 0.5.5 lokole_admin_user: admin # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!) lokole_admin_password: changeme lokole_install_path: "{{ content_base }}/lokole" # /library/lokole