From 3ecfa69c82b2983064faff0c4fafb26e80b2f6b6 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Sun, 15 Nov 2020 00:25:49 +0000
Subject: [PATCH] Prepare for Ubuntu 21.04 (Hirsute Hippo)

---
 scripts/local_facts.fact |  4 ++++
 vars/default_vars.yml    |  1 +
 vars/ubuntu-21.yml       | 28 ++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 vars/ubuntu-21.yml

diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact
index 14f8f7b17..311a00136 100755
--- a/scripts/local_facts.fact
+++ b/scripts/local_facts.fact
@@ -60,10 +60,14 @@ OS_VER=$OS-$VERSION_ID
 # 2020-10-21: Debian 11 (Bullseye) not yet supported but adding this line to
 # its /etc/os-release can help testing this unreleased OS: VERSION_ID="11"
 
+# 2020-11-14: Ubuntu 21.04 (Hirsute Hippo) not yet supported but this
+# unreleased OS can help testing.
+
 case $OS_VER in
     "debian-10"    | \
     "debian-11"    | \
     "ubuntu-20"    | \
+    "ubuntu-21"    | \
     "linuxmint-20" | \
     "raspbian-10")
        ;;
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 916dbb88a..3afc1edb1 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -688,6 +688,7 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 is_debuntu: False    # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian)
 
 is_ubuntu: False    # Covers: Ubuntu, Linux Mint
+is_ubuntu_21: False
 is_ubuntu_20: False
 is_ubuntu_19: False
 is_ubuntu_18: False
diff --git a/vars/ubuntu-21.yml b/vars/ubuntu-21.yml
new file mode 100644
index 000000000..05605edab
--- /dev/null
+++ b/vars/ubuntu-21.yml
@@ -0,0 +1,28 @@
+is_debuntu: True
+is_ubuntu: True
+is_ubuntu_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
+# 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