From b8f60b0098f968e6a0971ab225a48ed29e5f5d2f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 17 May 2024 13:44:41 +0200
Subject: [PATCH] Update 33-nginx_ingress.sh

---
 .../rootfs/etc/cont-init.d/33-nginx_ingress.sh       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/birdnet-pi/rootfs/etc/cont-init.d/33-nginx_ingress.sh b/birdnet-pi/rootfs/etc/cont-init.d/33-nginx_ingress.sh
index 82adc044e..172d071e3 100755
--- a/birdnet-pi/rootfs/etc/cont-init.d/33-nginx_ingress.sh
+++ b/birdnet-pi/rootfs/etc/cont-init.d/33-nginx_ingress.sh
@@ -18,14 +18,18 @@ ingress_entry=$(bashio::addon.ingress_entry)
 # Quits if ingress not active
 if [ -z "$ingress_entry" ]; then exit 0; fi
 
-# Create .htpasswd
-export "$(grep "^CADDY_PWD" /config/birdnet.conf)"
-htpasswd -b -c /home/pi/.htpasswd birdnet "$CADDY_PWD" &>/dev/null
-
 echo " "
 bashio::log.info "Adapting for ingress"
+echo "... setting up nginx"
 sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
 sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
 sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
 
+# Create .htpasswd
+echo "... setting up automatic identification"
+export "$(grep "^CADDY_PWD" /config/birdnet.conf)"
+htpasswd -b -c /home/pi/.htpasswd birdnet "$CADDY_PWD" &>/dev/null
+chown 1000:1000 /home/pi/.htpasswd
+#sed -i '/caddy_pwd,\$config/a exec("htpasswd -b -c /home/pi/.htpasswd birdnet \"$caddy_pwd\" &>/dev/null");' "$HOME"/BirdNET-Pi/scripts/advanced.php
+
 echo " "