diff --git a/birdnet-pi/CHANGELOG.md b/birdnet-pi/CHANGELOG.md index 72d29c0b4..e69a22b14 100644 --- a/birdnet-pi/CHANGELOG.md +++ b/birdnet-pi/CHANGELOG.md @@ -1,4 +1,6 @@ -- Install tensorflow if avx2 not available +## 2025.01-4 (08-01-2025) +- Older CPU support : install tensorflow if avx2 not available +- Align to upstream ## 0.13-106 (30-10-2024) - Implement interactive plot diff --git a/birdnet-pi/config.json b/birdnet-pi/config.json index 719151288..cabc220c0 100644 --- a/birdnet-pi/config.json +++ b/birdnet-pi/config.json @@ -120,6 +120,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pi", "usb": true, - "version": "0.13-106", + "version": "2025.01-4", "video": true } diff --git a/birdnet-pi/rootfs/etc/cont-init.d/01-oldcpu.sh b/birdnet-pi/rootfs/etc/cont-init.d/01-oldcpu.sh deleted file mode 100755 index 9b1a41cd0..000000000 --- a/birdnet-pi/rootfs/etc/cont-init.d/01-oldcpu.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/command/with-contenv bashio -# shellcheck shell=bash -set -e - -# Compensate for old cpu without avx2 -if [[ "$(uname -m)" = "x86_64" && lscpu | grep -q "Flags" && ! lscpu | grep -q "avx2" ]]; then - bashio::log.warning "NON SUPPORTED CPU DETECTED" - bashio::log.warning "Your cpu doesn't support avx2, the analyzer service will likely won't work" - bashio::log.warning "Trying to install tensorflow instead of tflite_runtime instead" - $PYTHON_VIRTUAL_ENV /usr/bin/pip3 uninstall -y tflite_runtime - $PYTHON_VIRTUAL_ENV /usr/bin/pip3 install tensorflow -fi diff --git a/birdnet-pi/rootfs/etc/cont-init.d/98-oldcpu.sh b/birdnet-pi/rootfs/etc/cont-init.d/98-oldcpu.sh new file mode 100755 index 000000000..512357e2c --- /dev/null +++ b/birdnet-pi/rootfs/etc/cont-init.d/98-oldcpu.sh @@ -0,0 +1,18 @@ +#!/command/with-contenv bashio +# shellcheck shell=bash +set -e + +# Check if the CPU supports AVX2 +if [[ "$(uname -m)" = "x86_64" ]]; then + if lscpu | grep -q "Flags"; then + if ! lscpu | grep -q "avx2"; then + bashio::log.warning "NON SUPPORTED CPU DETECTED" + bashio::log.warning "Your cpu doesn't support avx2, the analyzer service will likely won't work" + bashio::log.warning "Trying to install tensorflow instead of tflite_runtime instead" + chown "0:0" /home/pi/.cache/pip + $PYTHON_VIRTUAL_ENV /usr/bin/pip3 uninstall -y tflite_runtime + $PYTHON_VIRTUAL_ENV /usr/bin/pip3 install tensorflow + chown "$PUID:$PGID" /home/pi/.cache/pip + fi + fi +fi diff --git a/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py b/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py index 48921f659..5d6f76770 100644 --- a/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py +++ b/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py @@ -51,7 +51,7 @@ def get_bird_code(scientific_name): def automatic_mqtt_publish(file, detection, path): bird = {} - bird['Date'] = file.date + bird['Date'] = file.file_date bird['Time'] = file.time bird['ScientificName'] = detection.scientific_name.replace('_', ' ') bird['CommonName'] = detection.common_name diff --git a/mealie/CHANGELOG.md b/mealie/CHANGELOG.md index 948bd9838..0325c50d0 100644 --- a/mealie/CHANGELOG.md +++ b/mealie/CHANGELOG.md @@ -1,3 +1,5 @@ +## v2.4.2-2 (08-01-2025) +- Minor bugs fixed ## v2.4.1-2 (21-12-2024) - Minor bugs fixed diff --git a/mealie/README.md b/mealie/README.md index 72f84048b..e775fada7 100644 --- a/mealie/README.md +++ b/mealie/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Mealie] Mealie does not start since last updates (opened 2025-01-07)](https://github.com/alexbelgium/hassio-addons/issues/1700) by [@duczz](https://github.com/duczz) ## ⚠ Open Issue : [🐛 [Mealie] redirecting to localhost:9000 when Accepting invitation or changeing language (opened 2025-01-07)](https://github.com/alexbelgium/hassio-addons/issues/1703) by [@phlo-c](https://github.com/phlo-c) # Hass.io Add-ons: Mealie diff --git a/mealie/config.json b/mealie/config.json index 36ccef8ba..e8bea6ed2 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -115,5 +115,5 @@ "slug": "mealie", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v2.4.2" + "version": "v2.4.2-2" } diff --git a/mealie/rootfs/etc/cont-init.d/31-nginx.sh b/mealie/rootfs/etc/cont-init.d/31-nginx.sh index 23eabae59..03036ad1e 100755 --- a/mealie/rootfs/etc/cont-init.d/31-nginx.sh +++ b/mealie/rootfs/etc/cont-init.d/31-nginx.sh @@ -33,3 +33,11 @@ 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 sed -i "s|%%base_subpath%%|${base_path}|g" /etc/nginx/servers/ingress.conf sed -i "s|%%base_subpath%%|${base_path}|g" /etc/nginx/servers/ssl.conf + +if bashio::config.has_value "BASE_URL"; then + BASE_URL="$(bashio::config "BASE_URL")" + BASE_URL="${BASE_URL#*://}:$(bashio::addon.port 9001)" + sed -i "s|%%BASE_URL%%|$BASE_URL|g" /etc/nginx/servers/ssl.conf +else + sed -i "/BASE_URL/d" /etc/nginx/servers/ssl.conf +fi diff --git a/mealie/rootfs/etc/nginx/servers/ssl.conf b/mealie/rootfs/etc/nginx/servers/ssl.conf index e91e6d7b2..5467257db 100644 --- a/mealie/rootfs/etc/nginx/servers/ssl.conf +++ b/mealie/rootfs/etc/nginx/servers/ssl.conf @@ -1,5 +1,4 @@ - server { - +server { listen 9001; include /etc/nginx/includes/server_params.conf; @@ -8,6 +7,10 @@ ssl_certificate /ssl/%%certfile%%; ssl_certificate_key /ssl/%%keyfile%%; + proxy_buffering off; + gzip_static off; + client_max_body_size 0; + location / { # Proxy pass proxy_pass http://localhost:9000; @@ -18,17 +21,25 @@ proxy_set_header Connection "upgrade"; # Improve ip handling + proxy_hide_header X-Powered-By; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Accept-Encoding ""; proxy_read_timeout 90; - # Correct base_url + # Ensure the backend knows the correct host + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Host $host; + + # Correct base_url + absolute_redirect off; sub_filter_once off; sub_filter_types *; sub_filter %%base_subpath%% /; - } + # Rewrite URLs in the response + sub_filter localhost:9000 %%BASE_URL%%; + } } diff --git a/whatsapper/README.md b/whatsapper/README.md index fb66249df..58ef8a340 100644 --- a/whatsapper/README.md +++ b/whatsapper/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Whatsapper] Fails to start on RPI4 (opened 2024-12-27)](https://github.com/alexbelgium/hassio-addons/issues/1683) by [@paoloantinori](https://github.com/paoloantinori) # Home assistant add-on: Whatsapper [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)