adding new homepage for testing :)

- replaced all SERVICES arrays with commands
- altered {install,update}_services.sh to install new homepage
- renamed old index.html to mobile.html for mobile redirect

scripts/dump_logs.sh

@@ -3,25 +3,14 @@
 # set -x # Uncomment to debug
 source /etc/birdnet/birdnet.conf &> /dev/null
 LOG_DIR="${HOME}/BirdNET-Pi/logs"
-SERVICES=(avahi-alias@.service
-birdnet_analysis.service
-birdnet_log.service
-birdnet_recording.service
-birdstats.service
-birdterminal.service
-caddy.service
-extraction_log.service
-extraction.service
-extraction.timer
-icecast2.service
-livestream.service
-${SYSTEMD_MOUNT})
+
+services=$(awk '/service/ && /systemctl/ && !/php/ {print $3}' ${my_dir}/install_services.sh | sort)
 
 # Create logs directory
 [ -d ${LOG_DIR} ] || mkdir ${LOG_DIR}
 
 # Create services logs
-for i in "${SERVICES[@]}";do
+for i in "${services[@]}";do
   if [ -L /etc/systemd/system/multi-user.target.wants/${i} ];then
     journalctl -u ${i} -n 100 --no-pager > ${LOG_DIR}/${i}.log
     cp -L /etc/systemd/system/multi-user.target.wants/${i} ${LOG_DIR}/${i}

scripts/install_services.sh

@@ -109,17 +109,17 @@ create_necessary_dirs() {
   [ -d ${EXTRACTED}/By_Scientific_Name ] || sudo -u ${USER} mkdir -p ${EXTRACTED}/By_Scientific_Name
   [ -d ${PROCESSED} ] || sudo -u ${USER} mkdir -p ${PROCESSED}
 
-  sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/index.html ${EXTRACTED}  
+  sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}  
   if [ ! -z ${BIRDNETLOG_URL} ];then
     BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/templates/index.html
+    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*
   fi
   if [ ! -z ${EXTRACTIONLOG_URL} ];then
     EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/templates/index.html
+    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*
   fi
 
-  [ -L ${EXTRACTED}/scripts ] || sudo -u ${USER} ln -s $(dirname ${my_dir})/scripts ${EXTRACTED}
+  sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
   if [ ! -z ${BIRDNETPI_URL} ];then
     BIRDNETPI_URL="$(echo ${BIRDNETPI_URL} | sed 's/\/\//\\\/\\\//g')"
     phpfiles="$(grep -l birdnetpi.local ${my_dir}/*.php)"
@@ -132,9 +132,8 @@ create_necessary_dirs() {
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED}
   sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED}
   [ -L ${EXTRACTED}/phpsysinfo/phpsysinfo.ini ] || sudo -u ${USER} cp ${HOME}/phpsysinfo/phpsysinfo.ini.new ${HOME}/phpsysinfo/phpsysinfo.ini
-
 }
- 
+
 install_alsa() {
   echo "Checking for alsa-utils and pulseaudio"
   if which arecord &> /dev/null ;then

scripts/install_tmux_services.sh

@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-# This script installs a web-based terminal @ http://birdterminal.local
-# ONLY run this additional script if you trust everyone on your 
-# local network completely as the credentials are sent WITHOUT 
-# any SSL/TLS encryption. For a secure remote connection to your 
-# BirdNET-Pi command line, consider enabling SSH on the 
-# Raspberry Pi and using another Linux machine or an SSH 
-# client software, or you can alternately add the 'tls internal'
-# directive to the Caddyfile to add a self-signed certificate for TLS/SSL
-# encryption. For remote desktop access, NoMachine can be installed.
-source /etc/birdnet/birdnet.conf
-my_dir=$(realpath $(dirname $0))
-
-# Install tmux from version control
-install_tmux() {
-  DEPENDS=( 
-  automake
-  autoconf
-  libevent-2*
-  libevent-dev 
-  ncurses-bin
-  ncurses-base
-  ncurses-term
-  libncurses-dev 
-  build-essential 
-  bison
-  pkg-config 
-  gcc
-  )
-
-  if which tmux &>/dev/null; then
-    echo "tmux is installed"
-  else
-
-    sudo apt update && sudo apt -y install "${DEPENDS[@]}"
-
-    cd ${HOME} && git clone https://github.com/tmux/tmux.git
-    cd tmux
-    sh autogen.sh
-    ./configure && make && sudo make install
-    cd && rm -drf ./tmux
-    sudo ln -sf "$(dirname ${my_dir})/templates/tmux.conf" /etc/tmux.conf
-  fi
-}
-
-install_web_terminal() {
-  cat << EOF | sudo tee /etc/systemd/system/birdterminal.service
-[Unit]
-Description=A BirdNET-Pi Web Terminal
-
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-Environment=TERM=xterm-256color
-ExecStart=/usr/local/bin/gotty -w --title-format "Login!" -p 9111 tmux new -A -s Login sudo bash -c login
-
-[Install]
-WantedBy=multi-user.target
-EOF
-  HASHWORD="$(caddy hash-password -plaintext "${CADDY_PWD}")"
-  cat << EOF | sudo tee -a /etc/caddy/Caddyfile
-http://birdterminal.local {
-  reverse_proxy localhost:9111
-  basicauth {
-    birdnet "${HASHWORD}"
-  }
-}
-EOF
-  sudo systemctl enable --now birdterminal.service
-  sudo systemctl enable --now avahi-alias@birdterminal.local.service
-  sudo systemctl restart caddy
-}
-install_tmux
-install_web_terminal

scripts/restart_services.sh

@@ -6,18 +6,9 @@ sudo systemctl stop birdnet_recording.service
 sudo rm -rf ${RECS_DIR}/$(date +%B-%Y/%d-%A)/*
 sudo systemctl start birdnet_recording.service
 
-SERVICES=(avahi-alias@birdlog.local.service
-avahi-alias@birdnetpi.local.service
-avahi-alias@birdstats.local.service
-avahi-alias@extractionlog.local.service
-birdnet_analysis.service
-birdnet_log.service
-birdstats.service
-extraction.timer
-extractionlog.service
-livestream.service)
+services=$(awk '/service/ && /systemctl/ && !/php/ {print $3}' ${my_dir}/install_services.sh | sort)
 
-for i in  "${SERVICES[@]}";do
+for i in  "${services[@]}";do
   sudo systemctl restart ${i}
 done
 

scripts/uninstall.sh

@@ -45,30 +45,10 @@ uninstall.sh
 update_species.sh
 ${HOME}/.gotty)
 
-
-SERVICES=(avahi-alias@birdlog.local.service
-avahi-alias@birdnetpi.local.service
-avahi-alias@birdstats.local.service
-avahi-alias@extractionlog.local.service
-avahi-alias@birdterminal.local.service
-birdnet_analysis.service
-birdnet_log.service
-birdnet_recording.d
-birdnet_recording.service
-birdstats.service
-birdterminal.service
-caddy.service
-edit_birdnet_conf.service
-extraction_log.service
-extraction.service
-extraction.timer
-livestream.service
-pushed_notifications.service
-spectrogram_viewer.service
-${SYSTEMD_MOUNT})
+services=$(awk '/service/ && /systemctl/ && !/php/ {print $3}' ${my_dir}/install_services.sh | sort)
 
 remove_services() {
-  for i in "${SERVICES[@]}"; do
+  for i in "${services[@]}"; do
     if [ -L /etc/systemd/system/multi-user.target.wants/"${i}" ];then
       sudo systemctl disable --now "${i}"
     fi

scripts/update_services.sh

@@ -109,14 +109,14 @@ create_necessary_dirs() {
   [ -d ${EXTRACTED}/By_Scientific_Name ] || sudo -u ${USER} mkdir -p ${EXTRACTED}/By_Scientific_Name
   [ -d ${PROCESSED} ] || sudo -u ${USER} mkdir -p ${PROCESSED}
 
-  sudo -u ${USER} ln -fs $(dirname ${my_dir})/templates/index.html ${EXTRACTED}  
+  sudo -u ${USER} ln -fs $(dirname ${my_dir})/homepage/* ${EXTRACTED}  
   if [ ! -z ${BIRDNETLOG_URL} ];then
     BIRDNETLOG_URL="$(echo ${BIRDNETLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/templates/index.html
+    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8080/"${BIRDNETLOG_URL}"/g" $(dirname ${my_dir})/homepage/*
   fi
   if [ ! -z ${EXTRACTIONLOG_URL} ];then
     EXTRACTIONLOG_URL="$(echo ${EXTRACTIONLOG_URL} | sed 's/\/\//\\\/\\\//g')"
-    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/templates/index.html
+    sudo -u${USER} sed -i "s/http:\/\/birdnetpi.local:8888/"${EXTRACTIONLOG_URL}"/g" $(dirname ${my_dir})/homepage/*
   fi
 
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts ${EXTRACTED}
@@ -128,13 +128,12 @@ create_necessary_dirs() {
     done
   fi
 
-
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/spectrogram.* ${EXTRACTED}
   sudo -u ${USER} ln -fs $(dirname ${my_dir})/scripts/viewdb.php ${EXTRACTED}
   sudo -u ${USER} ln -fs ${HOME}/phpsysinfo ${EXTRACTED}
   [ -L ${EXTRACTED}/phpsysinfo/phpsysinfo.ini ] || sudo -u ${USER} cp ${HOME}/phpsysinfo/phpsysinfo.ini.new ${HOME}/phpsysinfo/phpsysinfo.ini
 }
- 
+
 install_alsa() {
   echo "Checking for alsa-utils and pulseaudio"
   if which arecord &> /dev/null ;then

scripts/viewdb.php

@@ -59,18 +59,17 @@ $mysqli->close();
 
 <head>
 	<meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
 	<title>BirdNET-Pi DB</title>
 	<!-- CSS FOR STYLING THE PAGE -->
 	<style>
 		* {
 		  box-sizing: border-box;
+                  padding: 5px;
 		}
 
 		.row {
 		  display: flex;
-		  margin-left:-5px;
-		  margin-right:-5px;
 		}
 
 		.column {
@@ -114,6 +113,7 @@ $mysqli->close();
 			border: 1px solid black;
 			padding: 10px;
 			text-align: center;
+		  	background-color: rgb(219, 296, 235);
 		}
 
 		@media screen and (max-width: 800px) {
@@ -166,7 +166,8 @@ $mysqli->close();
 	</style>
 </head>
 
-<body>
+<body style="background-color: rgb(119, 196, 135);background-image: linear-gradient(to top, rgb(119, 196, 135),black;">
+
 	<section>
 		<h2>Number of Detections</h2>
 		<table>