vars/ubuntu-2110.yml vars/ubuntu-2204.yml etc

scripts/local_facts.fact

@@ -42,10 +42,14 @@ fi    # of 2020: https://github.com/raspberrypi/Raspberry-Pi-OS-64bit/issues/6
 
 if tmp=$(grep ^VERSION_ID= /etc/os-release); then
     VERSION_ID=$(echo "$tmp" | cut -d= -f2)
-    VERSION_ID=${VERSION_ID//\"/}   # Remove all '"'
-    VERSION_ID=${VERSION_ID%%.*}    # Remove all '.' & stuff to the right of em
+    # https://gnu.org/software/bash/manual/bash.html#Shell-Parameter-Expansion
+    VERSION_ID=${VERSION_ID//\"/}    # Remove all '"'
+    [[ $OS == "ubuntu" ]] &&             # e.g. '22.04' -> '2204'
+        VERSION_ID=${VERSION_ID//\./}    # Remove all '.'
+    [[ $OS == "linuxmint" ]] &&         # e.g. '20.2' -> '20'
+        VERSION_ID=${VERSION_ID%%.*}    # Remove all '.' & stuff to the right
 fi
-OS_VER=$OS-$VERSION_ID
+OS_VER="$OS-$VERSION_ID"
 
 # Previously supported Linux distributions / versions:
     #"fedora-18"    | \
@@ -61,19 +65,16 @@ OS_VER=$OS-$VERSION_ID
     #"raspbian-8"   | \
     #"raspbian-9"   | \
 
-# 2021-06-19: Ubuntu 21.10 (Impish Indri) not yet supported but this
-# unreleased OS can help testing.  For now this means MANUALLY changing
-# php_version: 7.4 to 8.0 in /opt/iiab/iiab/vars/ubuntu-21.yml
-
-# 2020-07-31: Debian 12 (Bookworm) not yet supported but adding this line
-# to its /etc/os-release can help testing this upcoming OS: VERSION_ID="12"
+# 2020-09-27: With Debian 12 (Bookworm) pre-releases, please manually add
+# this line to its /etc/os-release before installing IIAB: VERSION_ID="12"
 
 case $OS_VER in
     "debian-11"    | \
     "debian-12"    | \
-    "ubuntu-20"    | \
-    "ubuntu-21"    | \
-    "ubuntu-22"    | \
+    "ubuntu-2004"  | \
+    "ubuntu-2104"  | \
+    "ubuntu-2110"  | \
+    "ubuntu-2204"  | \
     "linuxmint-20" | \
     "linuxmint-21" | \
     "raspbian-10"  | \

vars/default_vars.yml

@@ -713,9 +713,10 @@ pbx_http_port: 83
 is_debuntu: False    # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian)
 
 is_ubuntu: False    # Covers: Ubuntu, Linux Mint
-is_ubuntu_22: False
-is_ubuntu_21: False
-is_ubuntu_20: False
+is_ubuntu_2204: False
+is_ubuntu_2110: False
+is_ubuntu_2104: False
+is_ubuntu_2004: False
 is_ubuntu_19: False
 is_ubuntu_18: False
 is_ubuntu_17: False

vars/ubuntu-2004.yml

@@ -2,7 +2,7 @@
 # /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
 is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
-is_ubuntu_20: True
+is_ubuntu_2004: 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)

vars/ubuntu-2104.yml

@@ -2,7 +2,7 @@
 # /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
 is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
-is_ubuntu_21: True
+is_ubuntu_2104: 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)
@@ -23,7 +23,7 @@ mysql_service: mariadb
 apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
-php_version: 7.4    # 2021-04-22: Will Ubuntu 21.10 require 8.0?
-postgresql_version: 13    # 2021-04-22: Will Ubuntu 21.10 require 14?
+php_version: 7.4
+postgresql_version: 13
 systemd_location: /lib/systemd/system
 python_ver: 3.9

vars/ubuntu-2110.yml

@@ -0,0 +1,29 @@
+# Every is_<OS> var is initially set to 'False' at the bottom of
+# /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
+is_debuntu: True
+is_ubuntu: True    # Opposite of is_debian for now
+is_ubuntu_2110: 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_log_dir: /var/log/apache2
+smb_service: smbd
+nmb_service: nmbd
+systemctl_program: /bin/systemctl
+mysql_service: mariadb
+apache_log: /var/log/apache2/access.log
+sshd_package: openssh-server
+sshd_service: ssh
+php_version: 8.0
+postgresql_version: 13
+systemd_location: /lib/systemd/system
+python_ver: 3.9

vars/ubuntu-2204.yml

@@ -2,7 +2,7 @@
 # /opt/iiab/iiab/vars/default_vars.yml -- these 'True' lines override that:
 is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
-is_ubuntu_22: True
+is_ubuntu_2204: 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)