avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-01 10:50:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix BirdNET-Pi standalone Caddy startup

Browse Source
This commit is contained in:
Alexandre
2026-07-10 11:57:21 +02:00
parent 43e44deb95
commit d3322da5a5
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
birdnet-pi/rootfs/custom-services.d/02-caddy.sh
View File

@@ -1,25 +1,29 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# Dependencies
sockfile="empty"
until [[ -e /var/run/dbus/system_bus_socket ]] && [[ -e "$sockfile" ]]; do
# Wait for PHP-FPM only. D-Bus is optional in standalone Docker mode and must
# not prevent the web service from starting.
sockfile=""
until [[ -n "$sockfile" ]] && [[ -e "$sockfile" ]]; do
sleep 1s
sockfile="$(find /run/php -name "*.sock")"
sockfile="$(find /run/php -name "*.sock" -print -quit 2> /dev/null || true)"
done
# Correct fpm.sock
chown caddy:caddy /run/php/php*-fpm.sock
chown caddy:caddy "$sockfile"
sed -i "s|/run/php/php-fpm.sock|$sockfile|g" /helpers/caddy_ingress.sh
sed -i "s|/run/php/php-fpm.sock|$sockfile|g" /etc/caddy/Caddyfile
sed -i "s|/run/php/php-fpm.sock|$sockfile|g" "$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh
# Set timezone
TZ_VALUE="$(timedatectl show -p Timezone --value)"
export TZ="$TZ_VALUE"
# Set timezone without requiring D-Bus.
TZ_VALUE="${TZ:-}"
if [[ -S /var/run/dbus/system_bus_socket ]] && command -v timedatectl > /dev/null 2>&1; then
TZ_VALUE="$(timedatectl show -p Timezone --value 2> /dev/null || true)"
fi
export TZ="${TZ_VALUE:-Etc/UTC}"
# Update caddyfile with password
/."$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh &> /dev/null || true
"$HOME"/BirdNET-Pi/scripts/update_caddyfile.sh &> /dev/null || true
echo "Starting service: caddy"
/usr/bin/caddy run --config /etc/caddy/Caddyfile
exec /usr/bin/caddy run --config /etc/caddy/Caddyfile