mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
A Holt
GitHub
commit
409c2b1913
4 changed files with 91 additions and 115 deletions
|
|
@ -59,7 +59,7 @@ virtual_network_devices: "-e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0
|
|||
# Set defaults for discovery process as strings
|
||||
wifi1: "not found-1"
|
||||
wifi2: "not found-2"
|
||||
exclude_device: "none"
|
||||
exclude_devices: "none"
|
||||
device_gw: "none"
|
||||
prior_gw_device: ""
|
||||
|
||||
|
|
|
|||
|
|
@ -101,21 +101,40 @@
|
|||
set_fact:
|
||||
num_wifi_interfaces: "{{ count_wifi_interfaces.stdout|int }}"
|
||||
|
||||
- name: Detect wifi gateway active
|
||||
shell: ip r | grep default | grep {{ discovered_wireless_iface }} | wc -l
|
||||
register: wifi_gateway_found
|
||||
when: discovered_wireless_iface != "none"
|
||||
|
||||
- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if WiFi gateway is detected
|
||||
set_fact:
|
||||
has_wifi_gateway: True
|
||||
when: discovered_wireless_iface != "none" and (wifi_gateway_found.stdout|int > 0)
|
||||
|
||||
- name: Detect secondary gateway active
|
||||
shell: ip r | grep default | grep -v {{ discovered_wan_iface }} | awk '{print $5}'
|
||||
register: second_gateway_found
|
||||
|
||||
- name: Set exclude_devices for {{ second_gateway_found.stdout }} if gateway is detected
|
||||
set_fact:
|
||||
exclude_devices: "-e {{ second_gateway_found.stdout }}"
|
||||
when: second_gateway_found.changed
|
||||
|
||||
# XO hack here ap_device would not be active therefore not set with
|
||||
# wired as gw use ap_device to exclude eth0 from network calulations
|
||||
|
||||
- name: XO laptop override 2 WiFi on LAN
|
||||
set_fact:
|
||||
exclude_device: "eth0"
|
||||
when: iiab_wan_iface != "eth0" and discovered_wireless_iface != "none" and xo_model == "XO-1.5"
|
||||
#- name: XO laptop override 2 WiFi on LAN
|
||||
# set_fact:
|
||||
# exclude_devices: "-e eth0"
|
||||
# when: iiab_wan_iface != "eth0" and discovered_wireless_iface != "none" and xo_model == "XO-1.5"
|
||||
|
||||
- name: Exclude reserved Network Adapter if defined - takes adapter name
|
||||
set_fact:
|
||||
exclude_device: "{{ reserved_device }}"
|
||||
exclude_devices: "-e {{ reserved_device }} {{ exclude_devices }}"
|
||||
when: reserved_device is defined
|
||||
|
||||
- name: Count LAN ifaces
|
||||
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_device }} | wc -l
|
||||
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ exclude_devices }} | wc -l
|
||||
register: num_lan_interfaces_result
|
||||
|
||||
- name: Calculate number of LAN interfaces including WiFi
|
||||
|
|
@ -124,7 +143,7 @@
|
|||
|
||||
# LAN - pick non WAN's
|
||||
- name: Create list of LAN (non WAN) ifaces
|
||||
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_device }}
|
||||
shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ exclude_devices }}
|
||||
when: num_lan_interfaces != "0"
|
||||
register: lan_list_result
|
||||
|
||||
|
|
@ -145,16 +164,6 @@
|
|||
with_items:
|
||||
- "{{ lan_list_result.stdout_lines }}"
|
||||
|
||||
- name: Detect wifi gateway active
|
||||
shell: ip r | grep default | grep {{ discovered_wireless_iface }} | wc -l
|
||||
when: discovered_wireless_iface != "none"
|
||||
register: wifi_gateway_found
|
||||
|
||||
- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if gateway is detected
|
||||
set_fact:
|
||||
has_wifi_gateway: True
|
||||
when: wifi_gateway_found is defined and (wifi_gateway_found.stdout|int > 0)
|
||||
|
||||
- name: Set iiab_wireless_lan_iface to {{ discovered_wireless_iface }} if not none
|
||||
set_fact:
|
||||
iiab_wireless_lan_iface: "{{ discovered_wireless_iface }}"
|
||||
|
|
@ -240,8 +249,8 @@
|
|||
value: "{{ discovered_wireless_iface }}"
|
||||
- option: discovered_wired_iface
|
||||
value: "{{ discovered_wired_iface }}"
|
||||
# - option: 'iiab_wireless_lan_iface
|
||||
# value: '{{ iiab_wireless_lan_iface }}"
|
||||
- option: 'exclude_devices'
|
||||
value: "{{ exclude_devices }}"
|
||||
- option: num_lan_interfaces
|
||||
value: "{{ num_lan_interfaces }}"
|
||||
- option: gui_static_wan
|
||||
|
|
|
|||
100
scripts/ansible
100
scripts/ansible
|
|
@ -1,72 +1,48 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
# PLZ SEE http://FAQ.IIAB.IO > "What is Ansible and what version should I use?"
|
||||
|
||||
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.9.6" # For XO laptops (pip install) & CentOS (yum install rpm)
|
||||
# On most/other OS's we install the latest (likely more recent!) from PPA:
|
||||
GOOD_VER="2.10.1" # 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
|
||||
# http://ppa.launchpad.net/ansible/ansible/ubuntu/pool/main/a/ansible-base/
|
||||
# https://github.com/ansible/ansible/commits/stable-2.10/changelogs/CHANGELOG-v2.10.rst
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
# Why 'noninteractive' appears needed:
|
||||
# https://github.com/iiab/iiab/issues/564#issuecomment-347264985
|
||||
|
||||
echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)"
|
||||
#echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible-2.8.x ("Slow Food")\n'
|
||||
echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)\n"
|
||||
#echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible-2.9.x ("Slow Food")\n'
|
||||
|
||||
echo -e "RECOMMENDED PREREQUISITES:"
|
||||
echo -e "(1) Verify you're online"
|
||||
echo -e "(2) Remove all prior versions of Ansible using"
|
||||
echo -e "(2) Remove all prior versions of Ansible using..."
|
||||
echo -e " 'apt purge ansible-base' and/or 'pip uninstall ansible-base' and/or"
|
||||
echo -e " 'apt purge ansible' and/or 'pip uninstall ansible'"
|
||||
echo -e "(3) Remove all lines containing 'ansible' from"
|
||||
echo -e "(3) Remove all lines containing 'ansible' from..."
|
||||
echo -e " /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
|
||||
|
||||
echo -e "COMPLETE INSTALL INSTRUCTIONS:"
|
||||
echo -e "IIAB INSTALL INSTRUCTIONS: (OLDER, MANUAL APPROACH)"
|
||||
echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n"
|
||||
|
||||
if [ $(command -v ansible-playbook) ]; then # "command -v" is POSIX compliant; also catches built-in commands like "cd"
|
||||
if [ $(command -v ansible) ]; then # "command -v" is POSIX compliant; also catches built-in commands like "cd"
|
||||
CURR_VER=`ansible --version | head -1 | awk '{print $2}'` # To match iiab-install. Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
|
||||
echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!"
|
||||
echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
|
||||
if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
|
||||
echo "Please use your system's package manager (or pip if nec) to update Ansible.\n"
|
||||
exit 0
|
||||
elif [ -f /etc/olpc-release ]; then
|
||||
echo "Please use pip package manager to update Ansible.\n"
|
||||
exit 0
|
||||
fi
|
||||
else
|
||||
echo -e "ANSIBLE NOT FOUND ON THIS COMPUTER -- LET'S TRY TO INSTALL IT!"
|
||||
echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
|
||||
fi
|
||||
echo -e "(Internet-in-a-Box requests ansible-base $GOOD_VER or higher)\n"
|
||||
|
||||
if [ ! -f /etc/debian_version ]; then # e.g. Raspbian, Ubuntu, Mint & Debian
|
||||
echo -e "\nEXITING: /etc/debian_version FILE NOT FOUND. Linux OS support info here:"
|
||||
echo -e " https://github.com/iiab/iiab/wiki/IIAB-Platforms\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f /etc/olpc-release ]; then
|
||||
yum -y install ca-certificates nss
|
||||
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||
yum -y install python-pip python-setuptools python-wheel patch
|
||||
# Can above 3 lines be merged into 1 line?
|
||||
pip install --upgrade pip setuptools wheel #EOL just do it
|
||||
pip install ansible==$GOOD_VER --disable-pip-version-check
|
||||
elif [ -f /etc/centos-release ]; then
|
||||
yum -y install ansible
|
||||
# 2018-09-07: the next 4 lines aren't needed according to https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#latest-release-via-dnf-or-yum
|
||||
# yum -y install ca-certificates nss epel-release
|
||||
# yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||
# yum -y install python-pip python-setuptools python-wheel patch
|
||||
# yum -y install https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-$GOOD_VER-1.el7.ans.noarch.rpm
|
||||
#elif [ -f /etc/fedora-release ]; then
|
||||
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
||||
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
||||
# dnf -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||
# dnf -y install python-pip python-setuptools python-wheel patch
|
||||
## Parens are optional, but greatly clarify :)
|
||||
#elif (grep -qi ubuntu /etc/lsb-release 2> /dev/null) || (grep -qi ubuntu /etc/os-release); then
|
||||
# apt update
|
||||
# #apt -y install python-pip python-setuptools python-wheel patch # 2018-09-05: fails on @kananigit's Ubuntu 18.04/Server. Fix @ https://github.com/iiab/iiab/pull/1091
|
||||
# apt -y install software-properties-common # adds command "apt-add-repository"
|
||||
# apt-add-repository -y ppa:ansible/ansible # adds correct line to correct file e.g. adds line "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main" to /etc/apt/sources.list.d/ansible-ubuntu-ansible-bionic.list
|
||||
## elif UBUNTU MUST REMAIN ABOVE (as Ubuntu ALSO contains /etc/debian_version, which would trigger the line just below)
|
||||
#elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then
|
||||
#elif [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && [ ! -f /etc/olpc-release ]; then
|
||||
elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian
|
||||
if ! grep -q focal /etc/os-release; then
|
||||
echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n"
|
||||
$APT_PATH/apt update
|
||||
$APT_PATH/apt -y install dirmngr
|
||||
|
|
@ -84,24 +60,19 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian
|
|||
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'
|
||||
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)
|
||||
fi
|
||||
# 2020-08-25: Let's revert to RaspiOS's own /etc/apt/sources.list for 64-bit RaspiOS etc
|
||||
#if [ -f /etc/rpi-issue ]; then
|
||||
# # 2020-06-06: https://www.raspberrypi.org/forums/viewtopic.php?t=276340
|
||||
# echo -e "\nAdd a mirror to /etc/apt/sources.list if Raspberry Pi OS, which can be flaky..."
|
||||
# mv --no-clobber /etc/apt/sources.list /etc/apt/sources.list.old || true
|
||||
# echo -e "deb http://mirror.us.leaseweb.net/raspbian/raspbian buster main contrib non-free rpi" > /etc/apt/sources.list
|
||||
# echo -e "deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi" >> /etc/apt/sources.list
|
||||
# echo -e "# Uncomment line below then 'apt-get update' to enable 'apt-get source'" >> /etc/apt/sources.list
|
||||
# echo -e "#deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi" >> /etc/apt/sources.list
|
||||
#fi
|
||||
echo -e "\napt update; apt install ansible and python3 dependencies explained at:"
|
||||
|
||||
echo -e "\napt update; apt install ansible-base and python3 dependencies explained at:"
|
||||
echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n"
|
||||
$APT_PATH/apt update
|
||||
$APT_PATH/apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \
|
||||
python3-passlib python3-pip python3-setuptools python3-venv virtualenv
|
||||
$APT_PATH/apt -y --allow-downgrades install ansible-base \
|
||||
python3-pymysql python3-psycopg2 python3-passlib python3-pip \
|
||||
python3-setuptools python3-venv virtualenv
|
||||
|
||||
echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
|
||||
# IIAB requires these 2 Ansible Collections: (with ansible-base 2.10.0 or higher)
|
||||
ansible-galaxy collection install community.general # Re-running these
|
||||
ansible-galaxy collection install community.mysql # appears to be safe!?
|
||||
|
||||
echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible-base'\n\n"
|
||||
|
||||
# TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")
|
||||
#pip install ansible==2.4.4
|
||||
|
|
@ -112,11 +83,6 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian
|
|||
#wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb
|
||||
#apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb
|
||||
|
||||
else
|
||||
echo -e "\nEXITING: Could not detect your OS (unsupported?)\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Needed?
|
||||
mkdir -p /etc/ansible
|
||||
echo -e '[local]\nlocalhost\n' > /etc/ansible/hosts
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ Starting in November 2019, IIAB's Ansible installer ([/opt/iiab/iiab/scripts/ans
|
|||
- **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**
|
||||
- **python3-venv** for Good Measure?
|
||||
|
||||
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))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue