From bb709dc9d517c6a3bb17038ac811f6ea6f99527f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 04:43:10 -0500 Subject: [PATCH 01/30] #2025 #2026 got the package name wrong --- roles/2-common/tasks/packages.yml | 7 ------- scripts/ansible | 3 ++- scripts/ansible-2.8.x | 3 ++- scripts/ansible-2.9.x | 3 ++- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 35f55f499..89b3bad4e 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -63,10 +63,3 @@ - usbutils - wget state: present - -# 2019-10-31: roles/kalite crashed without the following python-virtualenv -- weirdly python3-virtualenv was installed on Raspbian (not sure why) but insufficient -- name: Install package python-virtualenv for KA Lite and Calibre-Web, on older OS's (raspbian-9, raspbian-10, debian-9, debian-10, ubuntu-16, ubuntu-18) - package: - name: python-virtualenv - state: present - when: is_raspbian_9 or is_raspbian_10 or is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_18 diff --git a/scripts/ansible b/scripts/ansible index 7d60c147c..7fbf6dbf4 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index f789c965f..cb9d73865 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index f33f00960..3b85ddf14 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -76,7 +76,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies\n" apt update - apt -y --allow-downgrades install ansible python3-distutils python3-mysqldb python3-passlib python3-pip python3-setuptools python3-virtualenv python3-psycopg2 + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ + python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") From 09e5ae64c7282c6acfbb1ce23a593f4049a26033 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 05:27:42 -0500 Subject: [PATCH 02/30] meta role cleanup - demo --- roles/4-server-options/tasks/main.yml | 38 ++++++++------------------- roles/6-generic-apps/tasks/main.yml | 11 ++++---- roles/7-edu-apps/tasks/main.yml | 20 +++++++------- roles/8-mgmt-tools/tasks/main.yml | 30 ++++++++++----------- roles/9-local-addons/tasks/main.yml | 17 ++++++++++++ 5 files changed, 59 insertions(+), 57 deletions(-) diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 409ebf366..dafc2f217 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -23,28 +23,18 @@ when: squid_install | bool tags: base, squid, network, domain -# until porting is complete -- name: Install python - package: - name: python - state: present - -- name: Create a Python interface to iiab.env - template: - src: roles/1-prep/templates/iiab_env.py.j2 - dest: /etc/iiab/iiab_env.py - -- name: Installing captive portal - include_tasks: roles/captive-portal/tasks/main.yml - when: captive_portal_install | bool - tags: base, captive-portal, network, domain - - name: Install Bluetooth - only on Raspberry Pi include_role: name: bluetooth when: is_rpi and bluetooth_install tags: bluetooth +- name: USB-LIB + include_role: + name: usb-lib + when: usb_lib_install | bool + tags: usb-lib + # NETWORK moved to the very end, after Stage 9 (9-LOCAL-ADDONS) # It can also be run manually using: cd /opt/iiab/iiab; ./iiab-network # @@ -68,11 +58,11 @@ tags: postgresql, pathagar, moodle # UNMAINTAINED -- name: AUTHSERVER - include_role: - name: authserver - when: authserver_install is defined and authserver_install - tags: olpc, authserver +#- name: AUTHSERVER +# include_role: +# name: authserver +# when: authserver_install is defined and authserver_install +# tags: olpc, authserver - name: CUPS include_role: @@ -86,12 +76,6 @@ when: samba_install | bool tags: samba -- name: USB-LIB - include_role: - name: usb-lib - when: usb_lib_install | bool - tags: usb-lib - - name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation. (This script was installed at the beginning of Stage 3 = roles/3-base-server/tasks/main.yml, which ran Apache playbook = roles/httpd/tasks/main.yml) command: /usr/bin/iiab-refresh-wiki-docs when: internet_available and not nodocs diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index 02a3b8dda..6e66c3a21 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -21,11 +21,12 @@ when: mediawiki_install | bool tags: mediawiki -- name: EJABBERD - include_role: - name: ejabberd - when: ejabberd_install | bool - tags: ejabberd +# unmaintained +#- name: EJABBERD +# include_role: +# name: ejabberd +# when: ejabberd_install | bool +# tags: ejabberd - name: ELGG include_role: diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 7c6d89823..39c74e929 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -34,18 +34,18 @@ tags: osm, maps # UNMAINTAINED -- name: OSM - include_role: - name: osm - when: osm_install is defined and osm_install - tags: osm, maps +#- name: OSM +# include_role: +# name: osm +# when: osm_install is defined and osm_install +# tags: osm, maps # UNMAINTAINED -- name: PATHAGAR - include_role: - name: pathagar - when: pathagar_install is defined and pathagar_install - tags: pathagar +#- name: PATHAGAR +# include_role: +# name: pathagar +# when: pathagar_install is defined and pathagar_install +# tags: pathagar - name: SUGARIZER include_role: diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml index 806b24f8f..7d5e91967 100644 --- a/roles/8-mgmt-tools/tasks/main.yml +++ b/roles/8-mgmt-tools/tasks/main.yml @@ -34,18 +34,18 @@ tags: phpmyadmin # UNMAINTAINED -- name: SUGAR-STATS - include_role: - name: sugar-stats - when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS" - tags: olpc, sugar-stats +#- name: SUGAR-STATS +# include_role: +# name: sugar-stats +# when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS" +# tags: olpc, sugar-stats # UNMAINTAINED -- name: TEAMVIEWER - include_role: - name: teamviewer - when: teamviewer_install is defined and teamviewer_install - tags: teamviewer +#- name: TEAMVIEWER +# include_role: +# name: teamviewer +# when: teamviewer_install is defined and teamviewer_install +# tags: teamviewer - name: VNSTAT include_role: @@ -54,11 +54,11 @@ tags: vnstat # UNMAINTAINED -- name: XOVIS - include_role: - name: xovis - when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS" - tags: xovis +#- name: XOVIS +# include_role: +# name: xovis +# when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS" +# tags: xovis - name: Recording STAGE 8 HAS COMPLETED ====================== lineinfile: diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index aabadd163..f4f73a392 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -9,6 +9,23 @@ when: internetarchive_install | bool tags: internetarchive +# until porting is complete +- name: Install python-2.7 + package: + name: python + state: present + +# used by iiab-update-map supplied by osm-vector-maps +- name: Create a Python interface to iiab.env + template: + src: roles/1-prep/templates/iiab_env.py.j2 + dest: /etc/iiab/iiab_env.py + +- name: Installing captive portal + include_tasks: roles/captive-portal/tasks/main.yml + when: captive_portal_install | bool + tags: base, captive-portal, network, domain + - name: MINETEST include_role: name: minetest From eb9d4648868f3e1120491878e2e95780e6aea853 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 05:38:08 -0500 Subject: [PATCH 03/30] ansible notes --- scripts/ansible.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 scripts/ansible.md diff --git a/scripts/ansible.md b/scripts/ansible.md new file mode 100644 index 000000000..16bc2f0bb --- /dev/null +++ b/scripts/ansible.md @@ -0,0 +1,21 @@ +In order to use optional modules that ansible is capable of the libraries +need to be installed, we make use of the following ansible modules: + +1. pip: we install python3-pip python3-setuptools virtualenv + as per https://docs.ansible.com/ansible/latest/modules/pip_module.html + +2. mysql_db: python3-pymysql + https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html#mysql-db-module + +3. mysql_user: python3-pymysql + https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html#mysql-user-module + https://github.com/ansible/ansible/issues/47736 + +4. postgresql_db: python3-psycopg2 + https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html#postgresql-db-module + +5. postgresql_dbuser: python3-psycopg2 + https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html#postgresql-user-module + +6. htpasswd: python3-passlib + https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html?highlight=htpasswd From 0f89fda8afe318c8e51e36e4e7bd2d732725086b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 05:55:36 -0500 Subject: [PATCH 04/30] python-pip for admin-console --- roles/9-local-addons/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index f4f73a392..88eb643d1 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -12,7 +12,9 @@ # until porting is complete - name: Install python-2.7 package: - name: python + name: + - python + - python-pip state: present # used by iiab-update-map supplied by osm-vector-maps From 6e1eec612f52c86845c9225680c26f6a13a899a7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 12:50:52 -0500 Subject: [PATCH 05/30] restore EJABBERD, OSM, PATHAGAR OSM, PATHAGAR would require virualenv work to port to python3 --- roles/6-generic-apps/tasks/main.yml | 10 +++++----- roles/7-edu-apps/tasks/main.yml | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index 6e66c3a21..0fe9df6ca 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -22,11 +22,11 @@ tags: mediawiki # unmaintained -#- name: EJABBERD -# include_role: -# name: ejabberd -# when: ejabberd_install | bool -# tags: ejabberd +- name: EJABBERD + include_role: + name: ejabberd + when: ejabberd_install | bool + tags: ejabberd - name: ELGG include_role: diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 39c74e929..7c6d89823 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -34,18 +34,18 @@ tags: osm, maps # UNMAINTAINED -#- name: OSM -# include_role: -# name: osm -# when: osm_install is defined and osm_install -# tags: osm, maps +- name: OSM + include_role: + name: osm + when: osm_install is defined and osm_install + tags: osm, maps # UNMAINTAINED -#- name: PATHAGAR -# include_role: -# name: pathagar -# when: pathagar_install is defined and pathagar_install -# tags: pathagar +- name: PATHAGAR + include_role: + name: pathagar + when: pathagar_install is defined and pathagar_install + tags: pathagar - name: SUGARIZER include_role: From 9fae04d557dfa45c4eb68376d4bb71b728350bd9 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 2 Nov 2019 13:12:26 -0500 Subject: [PATCH 06/30] requested wording --- scripts/ansible | 5 +++-- scripts/ansible-2.8.x | 5 +++-- scripts/ansible-2.9.x | 5 +++-- scripts/ansible.md | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index 7fbf6dbf4..ddbd2de18 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -74,10 +74,11 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367 - echo -e "\napt update; apt install ansible and python3 dependencies\n" + echo -e "\napt update; apt install ansible and python3 dependencies explained at:" + echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n"" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) + python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index cb9d73865..01d1805af 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -74,10 +74,11 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367 - echo -e "\napt update; apt install ansible and python3 dependencies\n" + echo -e "\napt update; apt install ansible and python3 dependencies explained at:" + echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) + python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index 3b85ddf14..a41138912 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -74,10 +74,11 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367 - echo -e "\napt update; apt install ansible and python3 dependencies\n" + echo -e "\napt update; apt install ansible and python3 dependencies explained at:" + echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv # (pulls in python3-distutils python3-virtualenv) + python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") diff --git a/scripts/ansible.md b/scripts/ansible.md index 16bc2f0bb..e28470dc1 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -3,6 +3,9 @@ need to be installed, we make use of the following ansible modules: 1. pip: we install python3-pip python3-setuptools virtualenv as per https://docs.ansible.com/ansible/latest/modules/pip_module.html + virtualenv is python3 only and pulls in python3-distutils python3-virtualenv + `apt show virtualenv` Depends: python3, python3-virtualenv + `apt show python3-virtualenv` Depends: python-pip-whl (>= 8.1.1-2), python3, python3-distutils, python3-pkg-resources 2. mysql_db: python3-pymysql https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html#mysql-db-module From d52f1c65c0bd440cec257c8652eb24d65e553837 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 10:42:43 -0500 Subject: [PATCH 07/30] Update ansible.md --- scripts/ansible.md | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/ansible.md b/scripts/ansible.md index e28470dc1..8930b8fe5 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -1,24 +1,26 @@ -In order to use optional modules that ansible is capable of the libraries -need to be installed, we make use of the following ansible modules: +Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ansible](https://github.com/iiab/iiab/blob/master/scripts/ansible)) began installing these python3-* apt packages, in support of the following Ansible modules: -1. pip: we install python3-pip python3-setuptools virtualenv - as per https://docs.ansible.com/ansible/latest/modules/pip_module.html - virtualenv is python3 only and pulls in python3-distutils python3-virtualenv - `apt show virtualenv` Depends: python3, python3-virtualenv - `apt show python3-virtualenv` Depends: python-pip-whl (>= 8.1.1-2), python3, python3-distutils, python3-pkg-resources +1. Ansible module: [pip](https://docs.ansible.com/ansible/latest/modules/pip_module.html) -2. mysql_db: python3-pymysql - https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html#mysql-db-module + IIAB installs apt packages: + - **python3-pip** (for IIAB's [Admin Console](https://github.com/iiab/iiab-admin-console)) + - **python3-setuptools** + - **virtualenv** (is Python 3 only, for [roles/kalite](https://github.com/iiab/iiab/tree/master/roles/kalite) & [roles/calibre-web](https://github.com/iiab/iiab/tree/master/roles/calibre-web) ?) and pulls in additional packages... (`apt show virtualenv` shows "Depends: python3, python3-virtualenv") + - **python3-virtualenv** and pulls in additional package... (`apt show python3-virtualenv` shows "Depends: python-pip-whl (>= 8.1.1-2), python3, python3-distutils, python3-pkg-resources") + - **python3-distutils** -3. mysql_user: python3-pymysql - https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html#mysql-user-module - https://github.com/ansible/ansible/issues/47736 +2. Ansible modules: [mysql_db](https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html) and [mysql_user](https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html) (for [roles/mysql](https://github.com/iiab/iiab/tree/master/roles/mysql)) -4. postgresql_db: python3-psycopg2 - https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html#postgresql-db-module + IIAB installs apt packages: + - **python3-pymysql** + - **python3-pymysql** (see [iiab/iiab#1714](https://github.com/iiab/iiab/issues/1714) and [ansible/ansible#47736](https://github.com/ansible/ansible/issues/47736)) -5. postgresql_dbuser: python3-psycopg2 - https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html#postgresql-user-module +4. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) -6. htpasswd: python3-passlib - https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html?highlight=htpasswd + IIAB installs apt package: + - **python3-psycopg2** (does Moodle still need this now that Pathagar is on its way out?) + +5. Ansible module: [htpasswd](https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html) + + IIAB installs apt package: + - **python3-passlib** (for [roles/munin](https://github.com/iiab/iiab/tree/master/roles/munin)) From b28280f227db519a56d5f8f088a5b7ee17869189 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 10:46:22 -0500 Subject: [PATCH 08/30] 6-generic-apps initial depr of EJABBERD --- roles/6-generic-apps/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index 0fe9df6ca..d1b9b8d7f 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -21,7 +21,7 @@ when: mediawiki_install | bool tags: mediawiki -# unmaintained +# UNMAINTAINED - name: EJABBERD include_role: name: ejabberd From 59a3298061168bc5cb3c7a35f0dcfcdc54a822c5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 10:48:08 -0500 Subject: [PATCH 09/30] 8-mgmt-tools: more fully deprecate SUGAR-STATS, TEAMVIEWER, XOVIS --- roles/8-mgmt-tools/tasks/main.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml index 7d5e91967..9536032b8 100644 --- a/roles/8-mgmt-tools/tasks/main.yml +++ b/roles/8-mgmt-tools/tasks/main.yml @@ -33,33 +33,12 @@ when: phpmyadmin_install | bool tags: phpmyadmin -# UNMAINTAINED -#- name: SUGAR-STATS -# include_role: -# name: sugar-stats -# when: sugar_stats_install is defined and sugar_stats_install and ansible_distribution != "CentOS" -# tags: olpc, sugar-stats - -# UNMAINTAINED -#- name: TEAMVIEWER -# include_role: -# name: teamviewer -# when: teamviewer_install is defined and teamviewer_install -# tags: teamviewer - - name: VNSTAT include_role: name: vnstat when: vnstat_install | bool tags: vnstat -# UNMAINTAINED -#- name: XOVIS -# include_role: -# name: xovis -# when: xovis_install is defined and xovis_install and ansible_distribution != "CentOS" -# tags: xovis - - name: Recording STAGE 8 HAS COMPLETED ====================== lineinfile: dest: "{{ iiab_env_file }}" From 2173bb07d190d7af3972a1ad09142002c3dd5824 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 10:52:49 -0500 Subject: [PATCH 10/30] 9-local-addons: Python 2.7 incl pip, Python interface to iiab.env, Captive Portal --- roles/9-local-addons/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index 88eb643d1..a2983948f 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -9,21 +9,21 @@ when: internetarchive_install | bool tags: internetarchive -# until porting is complete -- name: Install python-2.7 +# Until porting complete (@jvonau) +- name: 'Install Python 2.7 packages: python, python-pip' package: name: - python - - python-pip + - python-pip # Used by Admin Console state: present -# used by iiab-update-map supplied by osm-vector-maps +# Used by iiab-update-map, supplied by osm-vector-maps - name: Create a Python interface to iiab.env template: src: roles/1-prep/templates/iiab_env.py.j2 dest: /etc/iiab/iiab_env.py -- name: Installing captive portal +- name: CAPTIVE PORTAL include_tasks: roles/captive-portal/tasks/main.yml when: captive_portal_install | bool tags: base, captive-portal, network, domain From 7b29c90f1b78f84d328e2445c6d1478c172b0c42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:01:09 -0500 Subject: [PATCH 11/30] default_vars.yml: initial depr of ejabberd; more complete depr of authserver --- vars/default_vars.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index cb62c15a1..4e612a776 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -316,6 +316,7 @@ dokuwiki_enabled: False mediawiki_install: False mediawiki_enabled: False +# Unmaintained as of November 2019 ejabberd_install: False ejabberd_enabled: False @@ -538,10 +539,6 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # ============================================================================= # UNMAINTAINED LEGACY VARIABLES: YOU'RE TAKING BIG RISKS IF YOU USE ANY HERE... -# Unmaintained -# authserver_install: False -# authserver_enabled: False - # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: # # 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* @@ -559,9 +556,13 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # docker_install: False # docker_enabled: False -# THOSE ABOVE WERE STILL OCCASIONALLY USED AS OF SEPTEMBER 2019. +# THOSE ABOVE WERE STILL OCCASIONALLY USED AS OF NOVEMBER 2019. # ============================================================================= -# THOSE BELOW WERE *NOT* USED FOR YEARS, AS OF SEPTEMBER 2019. +# THOSE BELOW WERE *NOT* USED FOR YEARS, AS OF NOVEMBER 2019. + +# Unmaintained +# authserver_install: False +# authserver_enabled: False # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False From 9e60d863c3976bb7966417c4b6d964a2140467bf Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:01:33 -0500 Subject: [PATCH 12/30] local_vars_min.yml: initial depr of ejabberd --- vars/local_vars_min.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 65371faff..a92ce2e27 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -209,6 +209,7 @@ dokuwiki_enabled: False mediawiki_install: False mediawiki_enabled: False +# Unmaintained as of November 2019 ejabberd_install: False ejabberd_enabled: False From 6e96fcac03bbda38b6c2e19c4f468452e79d1b9c Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:01:50 -0500 Subject: [PATCH 13/30] local_vars_medium.yml: initial depr of ejabberd --- vars/local_vars_medium.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 86af15027..4afe19d52 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -209,6 +209,7 @@ dokuwiki_enabled: False mediawiki_install: False mediawiki_enabled: False +# Unmaintained as of November 2019 ejabberd_install: False ejabberd_enabled: False From f7de723c843656edb7102746259a54a50d55d657 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:02:05 -0500 Subject: [PATCH 14/30] local_vars_big.yml: initial depr of ejabberd --- vars/local_vars_big.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 8f316cf40..ef2b9f4e1 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -209,6 +209,7 @@ dokuwiki_enabled: True mediawiki_install: True mediawiki_enabled: True +# Unmaintained as of November 2019 ejabberd_install: False ejabberd_enabled: False From b0d0786df02e1674b757ed94d2b6964996a3a7a4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:09:09 -0500 Subject: [PATCH 15/30] 4-server-options: more fully depr AUTHSERVER --- roles/4-server-options/tasks/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index dafc2f217..ab3f97da4 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -57,13 +57,6 @@ when: postgresql_install | bool tags: postgresql, pathagar, moodle -# UNMAINTAINED -#- name: AUTHSERVER -# include_role: -# name: authserver -# when: authserver_install is defined and authserver_install -# tags: olpc, authserver - - name: CUPS include_role: name: cups From 278aa9734c8db1d9e4ea552835377a827a7a09dc Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:18:02 -0500 Subject: [PATCH 16/30] scripts/ansible: 80-char width somewhat cleaner --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index ddbd2de18..c607bb312 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -77,8 +77,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies explained at:" echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n"" apt update - apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ + python3-passlib python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" From bc6f48eb78299743c3593d4690d178a36244a201 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:19:07 -0500 Subject: [PATCH 17/30] scripts/ansible-2.8.x: 80-char width somewhat cleaner --- scripts/ansible-2.8.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index 01d1805af..9bc8ea676 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -77,8 +77,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies explained at:" echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update - apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ + python3-passlib python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") From 9f94ccfe6a6137ec4c4585780f85b955e6abd263 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:20:06 -0500 Subject: [PATCH 18/30] scripts/ansible-2.9.x: 80-char width somewhat cleaner --- scripts/ansible-2.9.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index a41138912..d57d644c1 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -77,8 +77,8 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; apt install ansible and python3 dependencies explained at:" echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update - apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 python3-passlib\ - python3-pip python3-setuptools virtualenv + apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ + python3-passlib python3-pip python3-setuptools virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") From 76eee33232ac28c80fd6abad66586d40b4180717 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:21:50 -0500 Subject: [PATCH 19/30] Update ansible.md --- scripts/ansible.md | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ansible.md b/scripts/ansible.md index 8930b8fe5..68ea4483b 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -12,7 +12,6 @@ Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ans 2. Ansible modules: [mysql_db](https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html) and [mysql_user](https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html) (for [roles/mysql](https://github.com/iiab/iiab/tree/master/roles/mysql)) IIAB installs apt packages: - - **python3-pymysql** - **python3-pymysql** (see [iiab/iiab#1714](https://github.com/iiab/iiab/issues/1714) and [ansible/ansible#47736](https://github.com/ansible/ansible/issues/47736)) 4. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) From 778edf6e5da53a5858e659d29192d9f060c16efc Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:22:15 -0500 Subject: [PATCH 20/30] Update ansible.md --- scripts/ansible.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible.md b/scripts/ansible.md index 68ea4483b..a31869085 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -11,7 +11,7 @@ Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ans 2. Ansible modules: [mysql_db](https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html) and [mysql_user](https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html) (for [roles/mysql](https://github.com/iiab/iiab/tree/master/roles/mysql)) - IIAB installs apt packages: + IIAB installs apt package: - **python3-pymysql** (see [iiab/iiab#1714](https://github.com/iiab/iiab/issues/1714) and [ansible/ansible#47736](https://github.com/ansible/ansible/issues/47736)) 4. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) From 61f049226bdc1b7611cfd3600ce6af5c17e82d2b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 11:26:59 -0500 Subject: [PATCH 21/30] Update ansible.md --- scripts/ansible.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ansible.md b/scripts/ansible.md index a31869085..46dfb7658 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -1,3 +1,5 @@ +Please read "What is Ansible and what version should I use?" at [http://FAQ.IIAB.IO](http://FAQ.IIAB.IO) + Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ansible](https://github.com/iiab/iiab/blob/master/scripts/ansible)) began installing these python3-* apt packages, in support of the following Ansible modules: 1. Ansible module: [pip](https://docs.ansible.com/ansible/latest/modules/pip_module.html) @@ -12,14 +14,14 @@ Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ans 2. Ansible modules: [mysql_db](https://docs.ansible.com/ansible/latest/modules/mysql_db_module.html) and [mysql_user](https://docs.ansible.com/ansible/latest/modules/mysql_user_module.html) (for [roles/mysql](https://github.com/iiab/iiab/tree/master/roles/mysql)) IIAB installs apt package: - - **python3-pymysql** (see [iiab/iiab#1714](https://github.com/iiab/iiab/issues/1714) and [ansible/ansible#47736](https://github.com/ansible/ansible/issues/47736)) + - **python3-pymysql** (see sudo's password-changing failure [iiab/iiab#1714](https://github.com/iiab/iiab/issues/1714) and [ansible/ansible#47736](https://github.com/ansible/ansible/issues/47736)) -4. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) +3. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) IIAB installs apt package: - **python3-psycopg2** (does Moodle still need this now that Pathagar is on its way out?) -5. Ansible module: [htpasswd](https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html) +4. Ansible module: [htpasswd](https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html) IIAB installs apt package: - **python3-passlib** (for [roles/munin](https://github.com/iiab/iiab/tree/master/roles/munin)) From 6820b8951e6f9dfdbd088c179d20bb9a7a9dd713 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 14:32:07 -0500 Subject: [PATCH 22/30] syntax errors: echo command quotes --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index c607bb312..c967b4f8e 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -75,7 +75,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367 echo -e "\napt update; apt install ansible and python3 dependencies explained at:" - echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n"" + echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ python3-passlib python3-pip python3-setuptools virtualenv @@ -95,7 +95,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" - echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n" + 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) else echo -e "\nEXITING: Could not detect your OS (unsupported?)\n" From c7e90260a7e166f57bcd38c596dd379b45c47a16 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 14:32:43 -0500 Subject: [PATCH 23/30] Update ansible-2.8.x --- scripts/ansible-2.8.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index 9bc8ea676..c611826c3 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -94,7 +94,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" - echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n" + 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) else echo -e "\nEXITING: Could not detect your OS (unsupported?)\n" From 696d4ace125bc86e9479ca3a0127eef142e2500d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 14:33:21 -0500 Subject: [PATCH 24/30] Update ansible-2.9.x --- 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 d57d644c1..56ae92936 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -94,7 +94,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" - echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n" + 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) else echo -e "\nEXITING: Could not detect your OS (unsupported?)\n" From e27a62b784afa2abe6977be2a377222b26e293f5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 14:37:25 -0500 Subject: [PATCH 25/30] Update ansible-2.8.x --- scripts/ansible-2.8.x | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index c611826c3..b80d0c2b6 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -79,6 +79,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ python3-passlib python3-pip python3-setuptools virtualenv + echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") From b083c525e10cb0ba07e99f29429eeeed5017fb0c Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 14:37:49 -0500 Subject: [PATCH 26/30] Update ansible-2.9.x --- scripts/ansible-2.9.x | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index 56ae92936..ee7e16ea9 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -79,6 +79,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ python3-passlib python3-pip python3-setuptools virtualenv + echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible") From 369f866161d101f78011bbf51e7ed901026133db Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 16:22:30 -0500 Subject: [PATCH 27/30] Update main.yml --- roles/9-local-addons/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index a2983948f..4af8db305 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -9,7 +9,7 @@ when: internetarchive_install | bool tags: internetarchive -# Until porting complete (@jvonau) +# Until porting complete (@jvonau helping transition to Python 3) - name: 'Install Python 2.7 packages: python, python-pip' package: name: From a49d93c41ac7bc5c3f60b25e18371a53b07254f6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 17:02:17 -0500 Subject: [PATCH 28/30] mysql/tasks/main.yml: clarify /root/.my.cnf --- roles/mysql/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 254c29bfc..00925eda0 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -124,7 +124,7 @@ enabled: yes when: mysql_enabled | bool -- name: Install .my.cnf file from template, with root password credentials, if mysql_enabled +- name: Install /root/.my.cnf file from template, with root password credentials, if mysql_enabled template: src: my.cnf.j2 dest: /root/.my.cnf From e35026eee94af1464cece11d27d341fab4e5ae78 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 3 Nov 2019 19:33:21 -0500 Subject: [PATCH 29/30] Update ansible.md --- scripts/ansible.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ansible.md b/scripts/ansible.md index 46dfb7658..e19225d1f 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -1,5 +1,7 @@ Please read "What is Ansible and what version should I use?" at [http://FAQ.IIAB.IO](http://FAQ.IIAB.IO) +Read https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide#ansible to learn more about how IIAB uses Ansible. + Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ansible](https://github.com/iiab/iiab/blob/master/scripts/ansible)) began installing these python3-* apt packages, in support of the following Ansible modules: 1. Ansible module: [pip](https://docs.ansible.com/ansible/latest/modules/pip_module.html) From 5ac1c932dc635349c103c23fb99d0ea9d5c71df2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 4 Nov 2019 12:27:08 -0500 Subject: [PATCH 30/30] ansible.md: clarify python3-psycopg2 is for Moodle --- scripts/ansible.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible.md b/scripts/ansible.md index e19225d1f..4aff4b213 100644 --- a/scripts/ansible.md +++ b/scripts/ansible.md @@ -21,7 +21,7 @@ Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ans 3. Ansible modules: [postgresql_db](https://docs.ansible.com/ansible/latest/modules/postgresql_db_module.html) and [postgresql_dbuser](https://docs.ansible.com/ansible/latest/modules/postgresql_user_module.html) IIAB installs apt package: - - **python3-psycopg2** (does Moodle still need this now that Pathagar is on its way out?) + - **python3-psycopg2** (for [roles/moodle](https://github.com/iiab/iiab/tree/master/roles/moodle)) 4. Ansible module: [htpasswd](https://docs.ansible.com/ansible/latest/modules/htpasswd_module.html)