From acb61f749b065cb18675e95153e804d3cfe0926d Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Sun, 6 Feb 2022 08:42:28 -0500
Subject: [PATCH] checks for caddy_pwd before creating the webterminal block

---
 scripts/install_services.sh | 9 ++++++++-
 scripts/update_services.sh  | 9 +++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 6f5203d..7205944 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -311,7 +311,7 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
 EOF
   fi
 
-  if [ ! -z ${WEBTERMINAL_URL} ];then
+  if [ ! -z ${WEBTERMINAL_URL} ] && [ -! z ${HASHWORD} ];then
     cat << EOF >> /etc/caddy/Caddyfile
 ${WEBTERMINAL_URL} {
   basicauth {
@@ -319,8 +319,15 @@ ${WEBTERMINAL_URL} {
   }
   reverse_proxy localhost:8888
 }
+EOF
+  elif [ ! -z ${WEBTERMINAL_URL} ] && [ -z ${HASHWORD} ];then
+    cat << EOF >> /etc/caddy/Caddyfile
+${WEBTERMINAL_URL} {
+  reverse_proxy localhost:8888
+}
 EOF
   fi
+
   if [ ! -z ${BIRDNETLOG_URL} ];then
     cat << EOF >> /etc/caddy/Caddyfile
 ${BIRDNETLOG_URL} {
diff --git a/scripts/update_services.sh b/scripts/update_services.sh
index 21f55ac..99e3d35 100755
--- a/scripts/update_services.sh
+++ b/scripts/update_services.sh
@@ -300,15 +300,20 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
 EOF
   fi
 
-  if [ ! -z ${WEBTERMINAL_URL} ];then
+  if [ ! -z ${WEBTERMINAL_URL} ] && [ -! z ${HASHWORD} ];then
     cat << EOF >> /etc/caddy/Caddyfile
-
 ${WEBTERMINAL_URL} {
   basicauth {
     birdnet ${HASHWORD}
   }
   reverse_proxy localhost:8888
 }
+EOF
+  elif [ ! -z ${WEBTERMINAL_URL} ] && [ -z ${HASHWORD} ];then
+    cat << EOF >> /etc/caddy/Caddyfile
+${WEBTERMINAL_URL} {
+  reverse_proxy localhost:8888
+}
 EOF
   fi
   if [ ! -z ${BIRDNETLOG_URL} ];then