diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index e31078caf..2bca88ea0 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -73,7 +73,9 @@ case $OS_VER in "debian-12" | \ "ubuntu-20" | \ "ubuntu-21" | \ + "ubuntu-22" | \ "linuxmint-20" | \ + "linuxmint-21" | \ "raspbian-10" | \ "raspbian-11") ;; diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 5a24b9079..b2097ed59 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -713,6 +713,7 @@ 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_19: False @@ -721,6 +722,7 @@ is_ubuntu_17: False is_ubuntu_16: False is_linuxmint: False # Subset of is_ubuntu +is_linuxmint_21: False is_linuxmint_20: False is_debian: False # Covers both: Debian, Raspberry Pi OS (Raspbian) diff --git a/vars/linuxmint-21.yml b/vars/linuxmint-21.yml new file mode 100644 index 000000000..5a1e79131 --- /dev/null +++ b/vars/linuxmint-21.yml @@ -0,0 +1,31 @@ +# Every is_ 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_22: True +is_linuxmint: True +is_linuxmint_21: 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.1 +postgresql_version: 14 +systemd_location: /lib/systemd/system +python_ver: 3.10 diff --git a/vars/ubuntu-22.yml b/vars/ubuntu-22.yml new file mode 100644 index 000000000..5d1653097 --- /dev/null +++ b/vars/ubuntu-22.yml @@ -0,0 +1,29 @@ +# Every is_ 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_22: 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.1 +postgresql_version: 14 +systemd_location: /lib/systemd/system +python_ver: 3.10