From 93a0ab53f9d4a8f841a461da090e920428aa6e57 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Dec 2020 12:57:25 -0500 Subject: [PATCH 1/9] Calibre-Web 0.6.9 -> 0.6.10 QA --- 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 a57ecfcc7..903b3b6e5 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: 0.6.9 # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8 +calibreweb_version: master # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8, 0.6.9 calibreweb_venv_path: /usr/local/calibre-web-py3 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py" From 4318387ad1ee65e9ea4f0f2a83f06c86abfe9b65 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Dec 2020 14:00:16 -0500 Subject: [PATCH 2/9] Gitea 1.13.0 -> 1.13.1 --- roles/gitea/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index 126020cc2..8157e7077 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -9,7 +9,7 @@ # Info needed to install Gitea: -gitea_version: 1.13.0 +gitea_version: 1.13.1 iset_suffixes: i386: 386 x86_64: amd64 From b93a69ce9899a6df15706dc08c203809098ae9ba Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 28 Dec 2020 19:22:25 -0500 Subject: [PATCH 3/9] Broken link in roles/network/README.rst --- roles/network/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/README.rst b/roles/network/README.rst index 7c8225078..89b446b89 100644 --- a/roles/network/README.rst +++ b/roles/network/README.rst @@ -12,7 +12,7 @@ Specifically, this 'network' role is run... Many IIAB networking questions can be answered in these 2 documents: -- `IIAB Networking `_ is a high-level summary, that reviews IIAB's 3 modes of operation distinguishing WAN from LAN, `common ports `_, DNS name resolution and some common customizations. +- `IIAB Networking `_ is a high-level summary, that reviews IIAB's 3 modes of operation distinguishing WAN from LAN, `common ports `_, DNS name resolution and some common customizations. - http://FAQ.IIAB.IO includes answers to common questions like: - What is local_vars.yml and how do I customize it? From f46d469eb7055176b94d8149d1798a28f40d78b2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 18 Jan 2021 19:48:49 -0500 Subject: [PATCH 4/9] ansible-base 2.10.5 --- scripts/ansible | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 33d725383..70fe819a0 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -5,7 +5,7 @@ APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.10.4" # Orig for 'yum install [rpm]' & XO laptops (pip install) +GOOD_VER="2.10.5" # Orig for 'yum install [rpm]' & XO laptops (pip install) # We install latest 'ansible-base' from PPA: (may be more recent than GOOD-VER) # https://launchpad.net/~ansible/+archive/ubuntu/ansible # https://launchpad.net/~ansible/+archive/ubuntu/ansible-2.10 @@ -15,8 +15,8 @@ GOOD_VER="2.10.4" # Orig for 'yum install [rpm]' & XO laptops (pip install) # IIAB implementers might instead consider these 2 GENERAL TECHNIQUES below # ("in an emergency!") e.g. if you must install an older version of Ansible: -# TEMPORARILY USE ANSIBLE 2.9.16 (REMOVE IT WITH "pip uninstall ansible") -#pip install ansible==2.9.16 +# TEMPORARILY USE ANSIBLE 2.9.17 (REMOVE IT WITH "pip uninstall ansible") +#pip install ansible==2.9.17 # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. Details: iiab/iiab#669 #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb" From 74acc0774a3bbb67a05ab71ca411220296d1b239 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Jan 2021 18:35:15 -0500 Subject: [PATCH 5/9] Comment out non-existent {{ ansible_product_uuid }} --- roles/0-init/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 1ac502f7b..ba11b05cb 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -137,8 +137,9 @@ value: "{{ ansible_memtotal_mb }}" - option: swap_mb value: "{{ ansible_swaptotal_mb }}" - - option: product_id - value: "{{ ansible_product_uuid }}" + # 2021-01-28: Non-existent, so fails with Ansible 2.10.5 (#2669) + #- option: product_id + # value: "{{ ansible_product_uuid }}" - option: gw_active value: "{{ gw_active }}" - option: internet_available From 3cdcddccfb1d59d1761687b6e7fe30d0938a9399 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Jan 2021 18:38:06 -0500 Subject: [PATCH 6/9] Non-existent var explanation --- roles/0-init/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index ba11b05cb..53864bb7f 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -137,7 +137,7 @@ value: "{{ ansible_memtotal_mb }}" - option: swap_mb value: "{{ ansible_swaptotal_mb }}" - # 2021-01-28: Non-existent, so fails with Ansible 2.10.5 (#2669) + # 2021-01-28: Non-existent var, so fails with Ansible 2.10.5 (#2669) #- option: product_id # value: "{{ ansible_product_uuid }}" - option: gw_active From 29954c8ba5de9d0eea20ada7c8ed75d80525d3fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Jan 2021 18:51:58 -0500 Subject: [PATCH 7/9] Clarify ansible-base 2.10.5 --- roles/0-init/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 53864bb7f..0a212c215 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -137,7 +137,7 @@ value: "{{ ansible_memtotal_mb }}" - option: swap_mb value: "{{ ansible_swaptotal_mb }}" - # 2021-01-28: Non-existent var, so fails with Ansible 2.10.5 (#2669) + # 2021-01-28: Non-existent var, so fails with ansible-base 2.10.5 (#2669) #- option: product_id # value: "{{ ansible_product_uuid }}" - option: gw_active From e144f9821be3cd16bdbeb1eda7a5f80b19975b21 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Jan 2021 20:24:10 -0500 Subject: [PATCH 8/9] Install 4th Ansible collection: community.postgresql --- collections.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/collections.yml b/collections.yml index 77c100ee3..f65d3a552 100644 --- a/collections.yml +++ b/collections.yml @@ -6,6 +6,7 @@ collections: - name: community.general - name: community.mysql + - name: community.postgresql - name: ansible.posix # 2020-11-28: For ~3 modules below... # selinux WAS in /opt/iiab/iiab/roles/1-prep/tasks/main.yml From 45866f2eb9b6287de531ce416fb3d2a6ded8ed06 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Jan 2021 20:26:11 -0500 Subject: [PATCH 9/9] ~4 instead of ~3 Andible collections going forward --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 33d725383..9def2cf42 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -94,7 +94,7 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \ # (Re)running collection installs appears safe, with --force-with-deps to force # upgrade of collection and dependencies it pulls in. Note Ansible may support # upgrading all collections cleanly in future. See PRs #2647 #2652 #2653 #2655 -echo -e "\n\nIIAB requires these ~3 Ansible Collections: (we upgrade them here if possible!)\n" +echo -e "\n\nIIAB requires these ~4 Ansible Collections: (we upgrade them here if possible!)\n" ansible-galaxy collection install --force-with-deps \ -r /opt/iiab/iiab/collections.yml \ -p /usr/share/ansible/collections