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 diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 1ac502f7b..0a212c215 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 var, so fails with ansible-base 2.10.5 (#2669) + #- option: product_id + # value: "{{ ansible_product_uuid }}" - option: gw_active value: "{{ gw_active }}" - option: internet_available 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" 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 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? diff --git a/scripts/ansible b/scripts/ansible index 33d725383..8e718a862 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" @@ -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