claudecode/AvianVisitors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrapping up URL variable changes for public installations

Browse Source
This commit is contained in:
Patrick McGuire
2021-10-20 12:22:47 -04:00
parent 49dabb6c85
commit 1a1bb006f2
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Birders_Guide_Installer.sh
+5 -5
View File
@@ -232,7 +232,7 @@ DO_RECORDING=y
################################################################################ ################################################################################
#----------------------- Web-hosting/Caddy File-server -----------------------# #----------------------- 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___________________# #____________to your data,(e.g., extractions, raw data, live___________________#
#______________audio stream, BirdNET.selection.txt files)______________________# #______________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 ## 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 ## 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 ## the BirdNET-Pi on your local network, keep this EMPTY.
## http://birdnetpi.local. Setting this will also allow you to enable the
## GoTTY web logging features below.
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 ## 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 ## the "Processed" directory and live audio stream. This MUST be set if you
birdnet.conf-defaults
+2 -4
View File
@@ -53,7 +53,7 @@ DO_RECORDING=
################################################################################ ################################################################################
#----------------------- Web-hosting/Caddy File-server -----------------------# #----------------------- 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___________________# #____________to your data,(e.g., extractions, raw data, live___________________#
#______________audio stream, BirdNET.selection.txt files)______________________# #______________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 ## 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 ## 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. ## BirdNET-Pi on your local network, keep this empty.
## Setting this (even to http://localhost) will also allow you to enable the
## GoTTY web logging features below.
BIRDNETPI_URL= BIRDNETPI_URL=
scripts/install_config.sh
+9 -7
View File
@@ -43,7 +43,7 @@ get_DO_RECORDING() {
done done
} }
get_EXTRACTIONS_URL() { get_BIRDNETPI_URL() {
while true;do while true;do
read -n1 -p "Would you like to access the extractions via a web browser? 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 case $CADDY_SERVICE in
[Yy] ) read -p "What URL would you like to publish the extractions to? [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 *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_CADDY_PWD
get_ICE_PWD get_ICE_PWD
break;; break;;
[Nn] ) EXTRACTIONS_URL= CADDY_PWD= ICE_PWD=;break;; [Nn] ) BIRDNETPI_URL= CADDY_PWD= ICE_PWD=;break;;
* ) echo "Please answer Yes or No";; * ) echo "Please answer Yes or No";;
esac esac
done done
@@ -165,7 +165,7 @@ configure() {
get_DB_PWDS get_DB_PWDS
get_DO_EXTRACTIONS get_DO_EXTRACTIONS
get_DO_RECORDING get_DO_RECORDING
get_EXTRACTIONS_URL get_BIRDNETPI_URL
get_PUSHED get_PUSHED
get_INSTALL_NOMACHINE get_INSTALL_NOMACHINE
get_CHANNELS get_CHANNELS
@@ -226,19 +226,21 @@ DO_RECORDING=${DO_RECORDING}
################################################################################ ################################################################################
#----------------------- Web-hosting/Caddy File-server -----------------------# #----------------------- 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___________________# #____________to your data,(e.g., extractions, raw data, live___________________#
#______________audio stream, BirdNET.selection.txt files)______________________# #______________audio stream, BirdNET.selection.txt files)______________________#
# Leave these EMPTY if you do not want to enable web access # # 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 ## 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. ## 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 ## Setting this (even to http://localhost) will also allow you to enable the
## GoTTY web logging features below. ## 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 ## 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 ## the "Processed" directory and live audio stream. This MUST be set if you
scripts/update_services.sh
-2
View File
@@ -191,7 +191,6 @@ install_caddy() {
} }
install_Caddyfile() { install_Caddyfile() {
set -x
echo "Installing the Caddyfile" echo "Installing the Caddyfile"
[ -d /etc/caddy ] || mkdir /etc/caddy [ -d /etc/caddy ] || mkdir /etc/caddy
if [ -f /etc/caddy/Caddyfile ];then if [ -f /etc/caddy/Caddyfile ];then
@@ -235,7 +234,6 @@ ${BIRDNETLOG_URL} {
EOF EOF
fi fi
systemctl reload caddy systemctl reload caddy
set +x
} }
install_avahi_aliases() { install_avahi_aliases() {