external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'iiab:master' into cryptography-experiment

Browse source
This commit is contained in:
A Holt 2023-09-10 19:57:11 -04:00 • committed by GitHub
commit 48bfe83c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/ansible
View file

@ -49,6 +49,7 @@ GOOD_VER=2.15.3 # Orig for 'yum install [rpm]' & XO laptops (pip install)
# https://launchpad.net/~ansible
# https://launchpad.net/~ansible-gha
# https://launchpad.net/~ansible/+archive/ubuntu/ansible
# https://launchpad.net/~ansible/+archive/ubuntu/ansible/+packages
# https://launchpad.net/~ansible/+archive/ubuntu/ansible-2.10 (OLD)
# http://ppa.launchpad.net/ansible/ansible/ubuntu/pool/main/a/ansible/ (OLD)
# http://ppa.launchpad.net/ansible/ansible/ubuntu/pool/main/a/ansible-core/
@ -89,10 +90,10 @@ echo -e "RECOMMENDED PREREQUISITES:"
echo -e "(1) Verify you're online"
echo -e "(2) Remove all prior versions of Ansible using..."
echo -e " 'apt purge ansible-core' and/or 'pip3 uninstall ansible-core' and/or"
echo -e " 'apt purge ansible-base' and/or 'pip3 uninstall ansible-base' and/or"
#echo -e " 'apt purge ansible-base' and/or 'pip3 uninstall ansible-base' and/or"
echo -e " 'apt purge ansible' and/or 'pip3 uninstall ansible'"
echo -e "(3) Remove all lines containing 'ansible' from..."
echo -e " /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
#echo -e "(3) Remove all lines containing 'ansible' from..."
#echo -e " /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
echo -e "IIAB INSTALL INSTRUCTIONS: (OLDER, MANUAL APPROACH)"
echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n"
@ -200,7 +201,16 @@ echo -e "\napt update; apt install python3-venv"
$APT_PATH/apt update
$APT_PATH/apt -y install python3-venv
if [[ $(dpkg --print-architecture) == i386 ]]; then
# 2023-09-08 PR #3634: 'apt install ansible-core' is overweight, but works on
# "32-bit" RasPiOS 12 (@EMG70 set 'arm_64bit=0' in /boot/config.txt per #3516
# to force boot its 32-bit kernel; its 64-bit kernel should work too!)
# IN SHORT: This ugly hack appears sufficient for all "32-bit" Bookworm+ OS's
# (similar to 32-bit Debian 12 on AMD/Intel a month ago, i.e. PR #3617).
# 2023-09-10 PR #3637: Even safer test than querying for Debian 12+ -- verify
# that apt package ansible-core is truly available:
if ! dpkg --print-architecture | grep -q 64 && apt-cache show ansible-core > /dev/null; then
#if ! dpkg --print-architecture | grep -q 64 && ! grep -q ^11 /etc/debian_version; then
#if [[ $(dpkg --print-architecture) == i386 ]]; then
# 2023-08-10: Quick+Dirty (BRUTE FORCE) on legacy 32-bit i386 avoids #3547
# rust/wheels/cryptography compiling mess! DEBIAN 12+ OR SIMILAR REQUIRED!
$APT_PATH/apt -y install ansible-core # Bookworm ~= ansible-core 2.14.3
@ -208,6 +218,12 @@ else
# 2023-03-22: OS's like Ubuntu 23.04 and Debian 12 (e.g. with Python 3.11+) ask
# that virtual environments (venv) be used to safely isolate pip installs:
# https://peps.python.org/pep-0668
# 2023-09-08: NEW WAY ANSIBLE RECOMMENDS? https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html
# $APT_PATH/apt -y install pipx # Typically adds 50+ packages!
# pipx install ansible-core
# pipx ensurepath # Adds /root/.local/bin to $PATH -- next time you open a shell -- e.g. for /root/.local/bin/ansible -> /root/.local/pipx/venvs/ansible-core/bin/ansible
echo -e "\nCreate virtual environment for Ansible"
python3 -m venv /usr/local/ansible

8
scripts/iiab-diagnostics
View file

@ -265,13 +265,13 @@ echo
echo -e "\e[1m"
#if [ "$ans" == "" ] || [ "$ans" == "y" ] || [ "$ans" == "Y" ]; then
if ! [[ $ans =~ ^[nNqQ]$ ]]; then
echo -ne "PUBLISHING TO URL... "
#pastebinit -b sprunge.us < $outfile # Stopped working mid-2023
echo -ne "PUBLISHING TO URL... " # Run 'pastebinit -l' to list other possible pastebin site URLs
pastebinit -b sprunge.us < $outfile # Stopped working for many weeks (mid-2023)
#pastebinit -b paste2.org < $outfile # Spammy/dangerous pastebins
pastebinit -b dpaste.com < $outfile # Run 'pastebinit -l' to list other possible pastebin site URLs
#pastebinit -b dpaste.com < $outfile # Claims 1,000,000 character maximum pastebin size, but not reliable
else
echo -e "If you later decide to publish it, run:"
echo
echo -e " pastebinit -b dpaste.com < $outfile"
echo -e " pastebinit -b sprunge.us < $outfile"
fi
echo -e "\e[0m"

2
scripts/iiab-diagnostics.README.md
View file

@ -55,7 +55,7 @@ But first off, the file is compiled by harvesting 1 + 6 kinds of things:
Or, you can later/manually upload it using the ``pastebinit`` command:
```
pastebinit -b dpaste.com < /etc/iiab/diag/NEW-FILE-NAME
pastebinit -b sprunge.us < /etc/iiab/diag/NEW-FILE-NAME
```
Either way, this will generate an actual web link (URL).

2
scripts/iiab-summary
View file

@ -64,7 +64,7 @@ else
echo "$(cat /etc/issue.net) $(cat /etc/debian_version)"
fi
echo "display-manager? $(systemctl is-active display-manager.service) Arch1: $(dpkg --print-architecture) Arch2: $(dpkg --print-foreign-architectures)"
uname -rvp
uname -nrvm
echo "$(lscpu | grep '^Model name:' | sed 's/^Model name:\s*//') $(lscpu | grep '^CPU(s):' | tr -s ' ') "$(free -m | tail -2 | tr -s ' ' | cut -d' ' -f1-2)
if [ -f /proc/device-tree/model ]; then
cat /proc/device-tree/model ; echo # MORE RPi DETAIL: tail -4 /proc/cpuinfo