From 1a1bb006f25b6bab65f837a376848a9ecb056bcd Mon Sep 17 00:00:00 2001
From: Patrick McGuire <mcguirepr89@gmail.com>
Date: Wed, 20 Oct 2021 12:22:47 -0400
Subject: [PATCH] wrapping up URL variable changes for public installations

---
 Birders_Guide_Installer.sh | 10 +++++-----
 birdnet.conf-defaults      |  6 ++----
 scripts/install_config.sh  | 16 +++++++++-------
 scripts/update_services.sh |  2 --
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Birders_Guide_Installer.sh b/Birders_Guide_Installer.sh
index 9003a9f..c32069b 100755
--- a/Birders_Guide_Installer.sh
+++ b/Birders_Guide_Installer.sh
@@ -232,7 +232,7 @@ DO_RECORDING=y
 
 ################################################################################
 #-----------------------  Web-hosting/Caddy File-server -----------------------#
-#__________The two variables below can be set to enable web access_____________#
+#________The four variables below can be set to enable internet access_________#
 #____________to your data,(e.g., extractions, raw data, live___________________#
 #______________audio stream, BirdNET.selection.txt files)______________________#
 
@@ -240,11 +240,11 @@ DO_RECORDING=y
 
 ## BIRDNETPI_URL is the URL where the extractions, data-set, and live-stream
 ## will be web-hosted. If you do not own a domain, or would just prefer to keep 
-## the BirdNET-Pi on your local network, you can set this to
-## http://birdnetpi.local. Setting this will also allow you to enable the   
-## GoTTY web logging features below.
+## the BirdNET-Pi on your local network, keep this EMPTY.
 
-BIRDNETPI_URL=http://birdnetpi.local
+BIRDNETPI_URL=
+EXTRACTIONLOG_URL=
+BIRDNETLOG_URL=
 
 ## CADDY_PWD is the plaintext password (that will be hashed) and used to access
 ## the "Processed" directory and live audio stream. This MUST be set if you
diff --git a/birdnet.conf-defaults b/birdnet.conf-defaults
index 160884f..118e0d4 100644
--- a/birdnet.conf-defaults
+++ b/birdnet.conf-defaults
@@ -53,7 +53,7 @@ DO_RECORDING=
 
 ################################################################################
 #-----------------------  Web-hosting/Caddy File-server -----------------------#
-#__________The two variables below can be set to enable web access_____________#
+#_______The two variables below can be set to enable internet access___________#
 #____________to your data,(e.g., extractions, raw data, live___________________#
 #______________audio stream, BirdNET.selection.txt files)______________________#
 
@@ -61,9 +61,7 @@ DO_RECORDING=
 
 ## BIRDNETPI_URL is the URL where the extractions, data-set, and live-stream
 ## will be web-hosted. If you do not own a domain, or would just prefer to keep 
-## BirdNET-Pi on your local network, you can set this to http://localhost.
-## Setting this (even to http://localhost) will also allow you to enable the   
-## GoTTY web logging features below.
+## BirdNET-Pi on your local network, keep this empty.
 
 BIRDNETPI_URL=
 
diff --git a/scripts/install_config.sh b/scripts/install_config.sh
index 2dafe15..d51bc6a 100755
--- a/scripts/install_config.sh
+++ b/scripts/install_config.sh
@@ -43,7 +43,7 @@ get_DO_RECORDING() {
   done
 }
 
-get_EXTRACTIONS_URL() {
+get_BIRDNETPI_URL() {
   while true;do
     read -n1 -p "Would you like to access the extractions via a web browser?
 
@@ -56,11 +56,11 @@ get_EXTRACTIONS_URL() {
     case $CADDY_SERVICE in
       [Yy] ) read -p "What URL would you like to publish the extractions to?
         *Note: Set this to http://localhost if you do not want to make the
-        extractions publically available: " EXTRACTIONS_URL
+        extractions publically available: " BIRDNETPI_URL
         get_CADDY_PWD
         get_ICE_PWD
         break;;
-      [Nn] ) EXTRACTIONS_URL= CADDY_PWD= ICE_PWD=;break;;
+      [Nn] ) BIRDNETPI_URL= CADDY_PWD= ICE_PWD=;break;;
       * ) echo "Please answer Yes or No";;
     esac
   done
@@ -165,7 +165,7 @@ configure() {
   get_DB_PWDS
   get_DO_EXTRACTIONS
   get_DO_RECORDING
-  get_EXTRACTIONS_URL
+  get_BIRDNETPI_URL
   get_PUSHED
   get_INSTALL_NOMACHINE
   get_CHANNELS
@@ -226,19 +226,21 @@ DO_RECORDING=${DO_RECORDING}
 
 ################################################################################
 #-----------------------  Web-hosting/Caddy File-server -----------------------#
-#__________The two variables below can be set to enable web access_____________#
+#________The four variables below can be set to enable internet access_________#
 #____________to your data,(e.g., extractions, raw data, live___________________#
 #______________audio stream, BirdNET.selection.txt files)______________________#
 
 #         Leave these EMPTY if you do not want to enable web access            #
 
-## EXTRACTIONS_URL is the URL where the extractions, data-set, and live-stream
+## BIRDNETPI_URL is the URL where the extractions, data-set, and live-stream
 ## will be web-hosted. If you do not own a domain, or would just prefer to keep 
 ## BirdNET-Pi on your local network, you can set this to http://localhost.
 ## Setting this (even to http://localhost) will also allow you to enable the   
 ## GoTTY web logging features below.
 
-EXTRACTIONS_URL=${EXTRACTIONS_URL}
+BIRDNETPI_URL=${BIRDNETPI_URL}
+EXTRACTIONLOG_URL=${EXTRACTIONLOG_URL}
+BIRDNETLOG_URL=${BIRDNETLOG_URL}}
 
 ## CADDY_PWD is the plaintext password (that will be hashed) and used to access
 ## the "Processed" directory and live audio stream. This MUST be set if you
diff --git a/scripts/update_services.sh b/scripts/update_services.sh
index aa14e38..3b72821 100755
--- a/scripts/update_services.sh
+++ b/scripts/update_services.sh
@@ -191,7 +191,6 @@ install_caddy() {
 }
 
 install_Caddyfile() {
-	set -x
   echo "Installing the Caddyfile"
   [ -d /etc/caddy ] || mkdir /etc/caddy
   if [ -f /etc/caddy/Caddyfile ];then
@@ -235,7 +234,6 @@ ${BIRDNETLOG_URL} {
 EOF
   fi
   systemctl reload caddy
-  set +x
 }
 
 install_avahi_aliases() {