Merge pull request #2415 from alexbelgium/codex/update-nginx.conf-installation-and-configurations

Use upstream frontend nginx.conf and generate ingress config at startup

birdnet-pipy/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 0.6.2 (29-01-2026)
+- Use upstream nginx.conf and generate ingress config at startup
 ## 0.6.1 (29-01-2026)
 - Minor bugs fixed
 ## 0.2 (29-01-2026)

birdnet-pipy/Dockerfile

@@ -57,6 +57,7 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL
 # Copy local files
 COPY rootfs/ /
 RUN find /etc -type f \( -name "*.sh" -o -path "*/services.d/*/run" \) -exec chmod +x {} \;
+COPY --from=frontend-builder /src/frontend/nginx.conf /etc/nginx/servers/nginx.conf
 
 # Uses /bin for compatibility purposes
 # hadolint ignore=DL4005

birdnet-pipy/config.yaml

@@ -98,4 +98,4 @@ schema:
   ssl: bool?
 slug: birdnet-pipy
 url: https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pipy
-version: "0.6.1"
+version: "0.6.2"

birdnet-pipy/rootfs/etc/cont-init.d/32-nginx_ingress.sh

@@ -14,12 +14,19 @@ ingress_interface="$(bashio::addon.ip_address)"
 ingress_entry="$(bashio::addon.ingress_entry)"
 ingress_entry_modified="$(echo "$ingress_entry" | sed 's/[@_!#$%^&*()<>?/\|}{~:]//g')"
 
-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
-sed -i "s#%%ingress_entry_modified%%#/${ingress_entry_modified}#g" /etc/nginx/servers/ingress.conf
-sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/nginx.conf
-sed -i "s#%%ingress_entry_modified%%#/${ingress_entry_modified}#g" /etc/nginx/servers/nginx.conf
+sed -i \
+    -e "s|proxy_pass http://api|proxy_pass http://127.0.0.1|g" \
+    -e "s|proxy_pass http://icecast|proxy_pass http://127.0.0.1|g" \
+    /etc/nginx/servers/nginx.conf
+
+cp /etc/nginx/servers/nginx.conf /etc/nginx/servers/ingress.conf
+sed -i \
+    -e "s|listen 80;|listen ${ingress_interface}:${ingress_port} default_server;|g" \
+    -e "/index index.html;/a\\    include /etc/nginx/includes/ingress_params.conf;" \
+    /etc/nginx/servers/ingress.conf
+
+sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/includes/ingress_params.conf
+sed -i "s#%%ingress_entry_modified%%#/${ingress_entry_modified}#g" /etc/nginx/includes/ingress_params.conf
 
 # Set DNS resolver for internal requests
 sed -i "s/%%dns_host%%/127.0.0.11/g" /etc/nginx/includes/resolver.conf