From 0023b3a54e527ab2655eb00458ea9c0b09d9cc5a Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 13 May 2021 20:36:10 -0500
Subject: [PATCH] Remove xenial conditions as no longer supported nor
 recommended

---
 jra_nextcloud.sh         | 2 +-
 quick_jibri_installer.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index c729fc5..f4009da 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -409,7 +409,7 @@ if [ "$ENABLE_HSTS" = "yes" ]; then
     sed -i "s|# add_header Strict-Transport-Security|add_header Strict-Transport-Security|g" $NC_NGINX_CONF
 fi
 
-if [ "$DISTRO_RELEASE" != "xenial" ] && [ ! -z "$PREAD_PROXY" ]; then
+if [ ! -z "$PREAD_PROXY" ]; then
     echo "
   Setting up Nextcloud domain on Jitsi Meet turn proxy
 "
diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index 9b28477..410c9a4 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -990,11 +990,11 @@ if [ "$ENABLE_SA" = "yes" ] && [ -f $WS_CONF ]; then
     sed -i "/RANDOM_AVATAR_URL_SUFFIX/ s|false|\'.png\'|" $INT_CONF
 fi
 #nginx -tlsv1/1.1
-if [ "$DROP_TLS1" = "yes" ] && [ "$DIST" != "xenial" ];then
+if [ "$DROP_TLS1" = "yes" ];then
     echo -e "\nDropping TLSv1/1.1 in favor of v1.3\n"
     sed -i "s|TLSv1 TLSv1.1|TLSv1.3|" /etc/nginx/nginx.conf
     #sed -i "s|TLSv1 TLSv1.1|TLSv1.3|" $WS_CONF
-elif [ "$DROP_TLS1" = "yes" ] && [ "$DIST" = "xenial" ];then
+elif [ "$DROP_TLS1" = "yes" ];then
     echo -e "\nOnly dropping TLSv1/1.1\n"
     sed -i "s|TLSv1 TLSv1.1||" /etc/nginx/nginx.conf
     sed -i "s| TLSv1.3||" $WS_CONF