From 2b8301bbec17c51568d723222b496e2ee6c0ca14 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 29 Jul 2021 10:01:22 -0400 Subject: [PATCH] Clarify scripts/ansible & 2-common/tasks/packages.yml --- roles/2-common/tasks/packages.yml | 1 + scripts/ansible | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 4d4905e47..36b61b943 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -30,6 +30,7 @@ #- openssh-server # ssh (Raspbian) or openssh-server (other OS's) already installed by 1-prep's roles/sshd/tasks/main.yml - pandoc # For /usr/bin/iiab-refresh-wiki-docs - pastebinit # For /usr/bin/iiab-diagnostics + #- python3-pip # Already installed by /opt/iiab/iiab/scripts/ansible -- this auto-installs 'python3-setuptools' and 'python3' etc - python3-venv # 2021-07-29: Unlike Debian 11, this is required on Ubuntu 20.04 (where packages like python3-pymysql -> python3 don't drag in 'python3-venv') -- for roles like {calibre-web, jupyterhub, lokole} -- whereas roles/kalite uses (virtual) package 'virtualenv' for Python 2 - rsync #- screen # Installed by 1-prep's roles/iiab-admin/tasks/access.yml diff --git a/scripts/ansible b/scripts/ansible index 0128976f2..c7755bf21 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -149,15 +149,17 @@ fi ###echo -e 'ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n' ###grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true # Override bash -e (instead of aborting at 1st error) -echo -e "\napt update; apt install python3-pip # Also installs 'python3-setuptools'" +echo -e "\napt update; apt install python3-pip # Also installs 'python3-setuptools' and 'python3' etc" #echo -e "https://github.com/iiab/iiab/blob/master/scripts/ansible.md\n" $APT_PATH/apt update $APT_PATH/apt -y install python3-pip -# 2021-07-28: -# 'python3-pymysql' (drags in 'python3' which drags in 'python3-venv') moved to roles/mysql/tasks/install.yml +# 2021-07-29: +# 'python3-packaging' dropped for now +# 'python3-pymysql' (drags in 'python3' which drags in 'python3-venv' on Debian 11 but not on Ubuntu 20.04) moved to roles/mysql/tasks/install.yml # 'python3-psycopg2' moved to roles/postgresql/tasks/install.yml # 'python3-passlib' moved to roles/munin/tasks/install.yml +# 'python3-venv' move to roles/2-common/tasks/packages.yml # 'virtualenv' for Python 2 moved to roles/kalite/tasks/install.yml # #$APT_PATH/apt -y install \