Merge pull request #2483 from holta/linuxmint-20

Experimental IIAB support for Linux Mint 20 ?

scripts/ansible

@@ -1,13 +1,15 @@
 #!/bin/bash -e
 
+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 other OS's we attempt the latest from PPA, which might be more recent
+# On most/other OS's we install the latest (likely more recent!) from PPA:
+# https://launchpad.net/~ansible/+archive/ubuntu/ansible
 
 export DEBIAN_FRONTEND=noninteractive
 
 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 'Alternative:     /opt/iiab/iiab/scripts/ansible-2.8.x ("Slow Food")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
 echo -e "(1) Verify you're online"
@@ -66,14 +68,14 @@ elif [ -f /etc/centos-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 update
+        $APT_PATH/apt update
-        apt -y install dirmngr
+        $APT_PATH/apt -y install dirmngr
         #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main" \
-        # > /etc/apt/sources.list.d/iiab-ansible.list
+        #    > /etc/apt/sources.list.d/iiab-ansible.list
 
         # 2020-08-20: TEMP WORKAROUND (REVERT TO ANSIBLE 2.9.6) MITIGATING #2481 (Ansible 2.9.12 and 2.10.0's 666-TO-600 file permissions problem). This installs 2.9.6-1ppa~disco onto RaspiOS, from https://launchpad.net/~ansible/+archive/ubuntu/ansible
         echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu disco main" \
-         > /etc/apt/sources.list.d/iiab-ansible.list
+            > /etc/apt/sources.list.d/iiab-ansible.list
 
         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
@@ -94,8 +96,8 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     fi
     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_PATH/apt update
-    apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \
+    $APT_PATH/apt -y --allow-downgrades install ansible 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"

scripts/local_facts.fact

@@ -22,24 +22,26 @@ DHCPCD_PATH=`which dhcpcd`
 NM_PATH=`which NetworkManager`
 
 case $OS_VER in
-    "fedora-18"  | \
+    "fedora-18"    | \
-    "fedora-22"  | \
+    "fedora-22"    | \
-    "debian-8"   | \
+    "debian-8"     | \
-    "debian-9"   | \
+    "debian-9"     | \
-    "debian-10"  | \
+    "debian-10"    | \
-    "ubuntu-16"  | \
+    "ubuntu-16"    | \
-    "ubuntu-17"  | \
+    "ubuntu-17"    | \
-    "ubuntu-18"  | \
+    "ubuntu-18"    | \
-    "ubuntu-19"  | \
+    "ubuntu-19"    | \
-    "ubuntu-20"  | \
+    "ubuntu-20"    | \
-    "centos-7"   | \
+    "linuxmint-20" | \
-    "raspbian-8" | \
+    "centos-7"     | \
-    "raspbian-9" | \
+    "raspbian-8"   | \
+    "raspbian-9"   | \
     "raspbian-10")
-        ;;
+       ;;
-    *)	OS_VER="OS_not_supported"
+    *) OS_VER="OS_not_supported"
-        ;;
+       ;;
 esac
+
 # get current version
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 COMMIT=`git rev-parse --verify HEAD`
@@ -71,7 +73,7 @@ ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ")
 if [ ! x$DHCPCD_PATH = x ]; then
     DHCPCD=`systemctl is-enabled dhcpcd`
 fi
-# the check is debian family only is_redhad would use NetworkManager as the
+# the check is debian family only is_redhat would use NetworkManager as the
 # service name.
 if [ ! x$NM_PATH = x ]; then
     NM=`systemctl is-enabled network-manager`

vars/linuxmint-20.yml

@@ -0,0 +1,29 @@
+is_debuntu: True
+is_ubuntu: True
+is_ubuntu_20: True
+
+# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
+# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
+dns_service: bind9
+dns_user: bind
+dhcp_service: isc-dhcp-server
+
+proxy: squid
+proxy_user: proxy
+apache_service: apache2
+apache_user: www-data
+apache_conf_dir: apache2/sites-available
+apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
+apache_log_dir: /var/log/apache2
+smb_service: smbd
+nmb_service: nmbd
+systemctl_program: /bin/systemctl
+# issue raised 
+mysql_service: mariadb
+apache_log: /var/log/apache2/access.log
+sshd_package: openssh-server
+sshd_service: ssh
+php_version: 7.4
+# "postgresql_version: 11.2" failed (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 19.04)
+postgresql_version: 12
+systemd_location: /lib/systemd/system