From 98048c56a8e549490b9f08a4fc60c7d06d9d01d5 Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Wed, 2 Feb 2022 18:33:34 -0500
Subject: [PATCH] switching EXTRACTIONLOG_URL to WEBTERMINAL_URL

---
 scripts/advanced.php               |  6 ++----
 scripts/clear_all_data.sh          |  8 ++++----
 scripts/install_config.sh          |  2 +-
 scripts/install_services.sh        | 20 ++++++++++----------
 scripts/reconfigure_birdnet_gui.sh |  2 +-
 scripts/rewrite_config.sh          |  2 +-
 scripts/update_services.sh         | 19 +++++++++++--------
 scripts/write_advanced.php         |  4 ++--
 scripts/write_config.sh            |  2 +-
 9 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/scripts/advanced.php b/scripts/advanced.php
index 77e6644..eb454b3 100644
--- a/scripts/advanced.php
+++ b/scripts/advanced.php
@@ -1,7 +1,3 @@
-<?php
-error_reporting(E_ALL);
-ini_set('display_errors',1);
-?>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <style>
 /* Chrome, Safari, Edge, Opera */
@@ -141,6 +137,8 @@ if (strcmp($config['FULL_DISK'], "keep") == 0) {
       <input name="birdnetpi_url" type="text" value="<?php print($config['BIRDNETPI_URL']);?>" /><br>
       <label for="birdnetlog_url">BirdNET-Lite Log URL: </label>
       <input name="birdnetlog_url" type="text" value="<?php print($config['BIRDNETLOG_URL']);?>" /><br>
+      <label for="webterminal_url">Web Terminal URL: </label>
+      <input name="webterminal_url" type="text" value="<?php print($config['WEBTERMINAL_URL']);?>" /><br>
       <h3>BirdNET-Lite Settings</h3>
       <label for="overlap">Overlap: </label>
       <input name="overlap" type="number" min="0.0" max="2.9" step="0.1" value="<?php print($config['OVERLAP']);?>" required/><br>
diff --git a/scripts/clear_all_data.sh b/scripts/clear_all_data.sh
index 8237c7d..31afdd1 100755
--- a/scripts/clear_all_data.sh
+++ b/scripts/clear_all_data.sh
@@ -30,12 +30,12 @@ if [ ! -z ${BIRDNETLOG_URL} ];then
     sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" ${i}
   done
 fi
-if [ ! -z ${EXTRACTIONLOG_URL} ];then
-  EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-  sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
+if [ ! -z ${WEBTERMINAL_URL} ];then
+  WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
+  sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" $(dirname ${my_dir})/homepage/*.html
   phpfiles="$(grep -l "$(hostname).local:8888" ${my_dir}/*.php)"
   for i in "${phpfiles[@]}";do
-    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" ${i}
+    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" ${i}
   done
 fi
 
diff --git a/scripts/install_config.sh b/scripts/install_config.sh
index d9044e1..a2559e2 100755
--- a/scripts/install_config.sh
+++ b/scripts/install_config.sh
@@ -238,7 +238,7 @@ ICE_PWD=${ICE_PWD}
 ## the BirdNET-Pi on your local network, keep this EMPTY.
 
 BIRDNETPI_URL=${BIRDNETPI_URL}
-EXTRACTIONLOG_URL${EXTRACTIONLOG_URL}
+WEBTERMINAL_URL${WEBTERMINAL_URL}
 BIRDNETLOG_URL=${BIRDNETLOG_URL}
 
 
diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 6eed9ae..0552cef 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -133,12 +133,12 @@ create_necessary_dirs() {
       sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" ${i}
     done
   fi
-  if [ ! -z ${EXTRACTIONLOG_URL} ];then
-    EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
+  if [ ! -z ${WEBTERMINAL_URL} ];then
+    WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
+    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "$(hostname).local:8888" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
-      sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" ${i}
+      sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" ${i}
     done
   fi
 
@@ -291,9 +291,12 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
 EOF
   fi
 
-  if [ ! -z ${EXTRACTIONLOG_URL} ];then
+  if [ ! -z ${WEBTERMINAL_URL} ];then
     cat << EOF >> /etc/caddy/Caddyfile
-${EXTRACTIONLOG_URL} {
+${WEBTERMINAL_URL} {
+  basicauth {
+    birdnet ${HASHWORD}
+  }
   reverse_proxy localhost:8888
 }
 EOF
@@ -309,10 +312,7 @@ EOF
 }
 
 update_etc_hosts() {
-  #BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
-  #EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-  #BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-  sed -ie s/'$(hostname).local'/"$(hostname).local ${BIRDNETPI_URL//https:\/\/} ${EXTRACTIONLOG_URL//https:\/\/} ${BIRDNETLOG_URL//https:\/\/}"/g /etc/hosts
+  sed -ie s/'$(hostname).local'/"$(hostname).local ${BIRDNETPI_URL//https:\/\/} ${WEBTERMINAL_URL//https:\/\/} ${BIRDNETLOG_URL//https:\/\/}"/g /etc/hosts
 }
 
 install_avahi_aliases() {
diff --git a/scripts/reconfigure_birdnet_gui.sh b/scripts/reconfigure_birdnet_gui.sh
index 24423ab..4f76522 100755
--- a/scripts/reconfigure_birdnet_gui.sh
+++ b/scripts/reconfigure_birdnet_gui.sh
@@ -37,7 +37,7 @@ fi
 
 if ! [ -z ${birdnetpi_url} ];then
 sed -i s/'^BIRDNETPI_URL=.*'/"BIRDNETPI_URL=${birdnetpi_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
-sed -i s/'^EXTRACTIONLOG_URL=.*'/"EXTRACTIONLOG_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
+sed -i s/'^WEBTERMINAL_URL=.*'/"WEBTERMINAL_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
 sed -i s/'^BIRDNETLOG_URL=.*'/"BIRDNETLOG_URL=${birdnetlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
 fi
 
diff --git a/scripts/rewrite_config.sh b/scripts/rewrite_config.sh
index c7707cc..2f684ce 100755
--- a/scripts/rewrite_config.sh
+++ b/scripts/rewrite_config.sh
@@ -30,7 +30,7 @@ fi
 
 if ! [ -z ${birdnetpi_url} ];then
 sed -i s/'^BIRDNETPI_URL=.*'/"BIRDNETPI_URL=${birdnetpi_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
-sed -i s/'^EXTRACTIONLOG_URL=.*'/"EXTRACTIONLOG_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
+sed -i s/'^WEBTERMINAL_URL=.*'/"WEBTERMINAL_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
 sed -i s/'^BIRDNETLOG_URL=.*'/"BIRDNETLOG_URL=${birdnetlog_url/\/\//\\\/\\\/}"/g ${birdnet_conf}
 fi
 
diff --git a/scripts/update_services.sh b/scripts/update_services.sh
index 40bd6b8..6991a3a 100755
--- a/scripts/update_services.sh
+++ b/scripts/update_services.sh
@@ -121,12 +121,12 @@ create_necessary_dirs() {
       sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8080/"${BIRDNETLOG_URL}"/g" ${i}
     done
   fi
-  if [ ! -z ${EXTRACTIONLOG_URL} ];then
-    EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*.html
+  if [ ! -z ${WEBTERMINAL_URL} ];then
+    WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
+    sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" $(dirname ${my_dir})/homepage/*.html
     phpfiles="$(grep -l "$(hostname).local:8888" ${my_dir}/*.php)"
     for i in "${phpfiles[@]}";do
-      sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${EXTRACTIONLOG_URL}"/g" ${i}
+      sudo -u${USER} sed -i "s/http:\/\/$(hostname).local:8888/"${WEBTERMINAL_URL}"/g" ${i}
     done
   fi
 
@@ -280,10 +280,13 @@ http://localhost http://$(hostname).local ${BIRDNETPI_URL} {
 EOF
   fi
 
-  if [ ! -z ${EXTRACTIONLOG_URL} ];then
+  if [ ! -z ${WEBTERMINAL_URL} ];then
     cat << EOF >> /etc/caddy/Caddyfile
 
-${EXTRACTIONLOG_URL} {
+${WEBTERMINAL_URL} {
+  basicauth {
+    birdnet ${HASHWORD}
+  }
   reverse_proxy localhost:8888
 }
 EOF
@@ -301,9 +304,9 @@ EOF
 
 update_etc_hosts() {
   #BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
-  #EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
+  #WEBTERMINAL_URL="$(echo ${WEBTERMINAL_URL} | sed 's/\/\//\\\/\\\//g')"
   #BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-  sed -ie s/'$(hostname).local'/"$(hostname).local ${BIRDNETPI_URL//https:\/\/} ${EXTRACTIONLOG_URL//https:\/\/} ${BIRDNETLOG_URL//https:\/\/}"/g /etc/hosts
+  sed -ie s/'$(hostname).local'/"$(hostname).local ${BIRDNETPI_URL//https:\/\/} ${WEBTERMINAL_URL//https:\/\/} ${BIRDNETLOG_URL//https:\/\/}"/g /etc/hosts
 }
 
 install_avahi_aliases() {
diff --git a/scripts/write_advanced.php b/scripts/write_advanced.php
index 3be99c4..63bfc0b 100644
--- a/scripts/write_advanced.php
+++ b/scripts/write_advanced.php
@@ -19,7 +19,7 @@ $contents = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=$caddy_pwd", $contents);
 $contents = preg_replace("/DB_PWD=.*/", "DB_PWD=$db_pwd", $contents);
 $contents = preg_replace("/ICE_PWD=.*/", "ICE_PWD=$ice_pwd", $contents);
 $contents = preg_replace("/BIRDNETPI_URL=.*/", "BIRDNETPI_URL=$birdnetpi_url", $contents);
-$contents = preg_replace("/EXTRACTIONLOG_URL=.*/", "EXTRACTIONLOG_URL=$extractionlog_url", $contents);
+$contents = preg_replace("/WEBTERMINAL_URL=.*/", "WEBTERMINAL_URL=$extractionlog_url", $contents);
 $contents = preg_replace("/BIRDNETLOG_URL=.*/", "BIRDNETLOG_URL=$birdnetlog_url", $contents);
 $contents = preg_replace("/OVERLAP=.*/", "OVERLAP=$overlap", $contents);
 $contents = preg_replace("/CONFIDENCE=.*/", "CONFIDENCE=$confidence", $contents);
@@ -35,7 +35,7 @@ $contents2 = preg_replace("/CADDY_PWD=.*/", "CADDY_PWD=$caddy_pwd", $contents2);
 $contents2 = preg_replace("/DB_PWD=.*/", "DB_PWD=$db_pwd", $contents2);
 $contents2 = preg_replace("/ICE_PWD=.*/", "ICE_PWD=$ice_pwd", $contents2);
 $contents2 = preg_replace("/BIRDNETPI_URL=.*/", "BIRDNETPI_URL=$birdnetpi_url", $contents2);
-$contents2 = preg_replace("/EXTRACTIONLOG_URL=.*/", "EXTRACTIONLOG_URL=$extractionlog_url", $contents2);
+$contents2 = preg_replace("/WEBTERMINAL_URL=.*/", "WEBTERMINAL_URL=$extractionlog_url", $contents2);
 $contents2 = preg_replace("/BIRDNETLOG_URL=.*/", "BIRDNETLOG_URL=$birdnetlog_url", $contents2);
 $contents2 = preg_replace("/OVERLAP=.*/", "OVERLAP=$overlap", $contents2);
 $contents2 = preg_replace("/CONFIDENCE=.*/", "CONFIDENCE=$confidence", $contents2);
diff --git a/scripts/write_config.sh b/scripts/write_config.sh
index bbb6df7..15bfa31 100755
--- a/scripts/write_config.sh
+++ b/scripts/write_config.sh
@@ -9,5 +9,5 @@ sed -i s/'^ICE_PWD=$'/"ICE_PWD=${ice_pwd}"/g ${birders_conf}
 sed -i s/'^DB_PWD=$'/"DB_PWD=${db_pwd}"/g ${birders_conf}
 sed -i s/'^BIRDWEATHER_ID=$'/"BIRDWEATHER_ID=${birdweather_id}"/g ${birders_conf}
 sed -i s/'^BIRDNETPI_URL=$'/"BIRDNETPI_URL=${birdnetpi_url/\/\//\\\/\\\/}"/g ${birders_conf}
-sed -i s/'^EXTRACTIONLOG_URL=$'/"EXTRACTIONLOG_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birders_conf}
+sed -i s/'^WEBTERMINAL_URL=$'/"WEBTERMINAL_URL=${extractionlog_url/\/\//\\\/\\\/}"/g ${birders_conf}
 sed -i s/'^BIRDNETLOG_URL=$'/"BIRDNETLOG_URL=${birdnetlog_url/\/\//\\\/\\\/}"/g ${birders_conf}