1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

support Ubuntu 23.10

This commit is contained in:
Jerry Vonau 2023-04-06 07:14:48 -05:00
parent 9880ed1d76
commit 847751aed3
4 changed files with 25 additions and 2 deletions

View file

@ -17,12 +17,12 @@
- python-setuptools # Provides setuptools-44 on recent OS's (last version compatible with python2) - python-setuptools # Provides setuptools-44 on recent OS's (last version compatible with python2)
- virtualenv # Drags in 'python3-virtualenv' which in turn drags in 'python3-pip' -- for Ansible module 'pip' when used with 'virtualenv_command: /usr/bin/virtualenv' and 'virtualenv_python: python2.7' -- compare package 'python3-venv' used by roles {calibre-web, jupyterhub, lokole} - virtualenv # Drags in 'python3-virtualenv' which in turn drags in 'python3-pip' -- for Ansible module 'pip' when used with 'virtualenv_command: /usr/bin/virtualenv' and 'virtualenv_python: python2.7' -- compare package 'python3-venv' used by roles {calibre-web, jupyterhub, lokole}
state: present state: present
when: not (is_debian_12 or is_ubuntu_2304) when: not (is_debian_12 or is_ubuntu_2304 or is_ubuntu_2310)
# 2020-03-31: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already. # 2020-03-31: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already.
- name: Use scripts/install_python2.sh to install python2 and virtualenv - name: Use scripts/install_python2.sh to install python2 and virtualenv
command: "{{ iiab_dir }}/scripts/install_python2.sh" command: "{{ iiab_dir }}/scripts/install_python2.sh"
when: is_debian_12 or is_ubuntu_2304 when: is_debian_12 or is_ubuntu_2304 or is_ubuntu_2310
- name: Use pip to pin setuptools to 44 in {{ kalite_venv }} # WAS: if Raspbian/Debian > 10 or Ubuntu > 19 - name: Use pip to pin setuptools to 44 in {{ kalite_venv }} # WAS: if Raspbian/Debian > 10 or Ubuntu > 19
pip: pip:

View file

@ -84,6 +84,7 @@ case $OS_VER in
"ubuntu-2204" | \ "ubuntu-2204" | \
"ubuntu-2210" | \ "ubuntu-2210" | \
"ubuntu-2304" | \ "ubuntu-2304" | \
"ubuntu-2310" | \
"linuxmint-21" | \ "linuxmint-21" | \
"raspbian-11" | \ "raspbian-11" | \
"raspbian-12") "raspbian-12")

View file

@ -773,6 +773,7 @@ pbx_http_port: 83
is_debuntu: False # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian) is_debuntu: False # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian)
is_ubuntu: False # Covers: Ubuntu, Linux Mint is_ubuntu: False # Covers: Ubuntu, Linux Mint
is_ubuntu_2310: False
is_ubuntu_2304: False is_ubuntu_2304: False
is_ubuntu_2210: False is_ubuntu_2210: False
is_ubuntu_2204: False is_ubuntu_2204: False

21
vars/ubuntu-2310.yml Normal file
View file

@ -0,0 +1,21 @@
# Every is_<OS_VER> 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_2310: True
# proxy: squid
# proxy_user: proxy
# apache_service: apache2
# apache_user: www-data
# smb_service: smbd
# nmb_service: nmbd
# systemctl_program: /bin/systemctl
# mysql_service: mariadb
# sshd_package: openssh-server
# sshd_service: ssh
# systemd_location: /lib/systemd/system
# php_version: "8.1"
# postgresql_version: 14
# python_version: "3.10"