avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-28 19:34:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Use upstream frontend nginx.conf and generate ingress config at startup
This commit is contained in:
Alexandre
2026-01-29 17:43:19 +01:00
committed by GitHub
parent 936d44c21c e75cf4beea
commit 5bdcab6ccd
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
birdnet-pipy/CHANGELOG.md
View File

@@ -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) ## 0.6.1 (29-01-2026)
- Minor bugs fixed - Minor bugs fixed
## 0.2 (29-01-2026) ## 0.2 (29-01-2026)

1
birdnet-pipy/Dockerfile
View File

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

2
birdnet-pipy/config.yaml
View File

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

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

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