diff --git a/birdnet-go/Dockerfile b/birdnet-go/Dockerfile index e82e0d4f9..7aa4cd2a8 100644 --- a/birdnet-go/Dockerfile +++ b/birdnet-go/Dockerfile @@ -48,7 +48,7 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh # Manual apps -ENV PACKAGES="alsa-utils libasound2-plugins" +ENV PACKAGES="alsa-utils libasound2-plugins nginx" # Automatic apps & bashio ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" diff --git a/birdnet-go/config.json b/birdnet-go/config.json index 5c04f7aa1..d29e65d21 100644 --- a/birdnet-go/config.json +++ b/birdnet-go/config.json @@ -8,12 +8,16 @@ "description": "Realtime BirdNET soundscape analyzer", "environment": { }, + "ingress": true, + "ingress_port": 0, + "ingress_stream": true, "image": "ghcr.io/alexbelgium/birdnet-go-{arch}", "init": false, "map": [ "addon_config:rw" ], "name": "birdnet-go", + "panel_icon": "mdi:bird", "ports": { "8080/tcp": 8080 }, @@ -26,6 +30,6 @@ }, "slug": "birdnet-go", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-go", - "version": "0.5.1", + "version": "0.5.1_test", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/birdnet-go/rootfs/etc/cont-init.d/32-nginx.sh b/birdnet-go/rootfs/etc/cont-init.d/32-nginx.sh new file mode 100644 index 000000000..775306244 --- /dev/null +++ b/birdnet-go/rootfs/etc/cont-init.d/32-nginx.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +################# +# NGINX SETTING # +################# + +declare ingress_interface +declare ingress_port + +echo "Adapting for ingress" +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf diff --git a/birdnet-go/rootfs/etc/cont-init.d/99-run.sh b/birdnet-go/rootfs/etc/cont-init.d/99-run.sh index c87db5b34..7dea40df5 100755 --- a/birdnet-go/rootfs/etc/cont-init.d/99-run.sh +++ b/birdnet-go/rootfs/etc/cont-init.d/99-run.sh @@ -14,4 +14,10 @@ echo " " ######################## bashio::log.info "Starting app..." -/usr/bin/birdnet-go realtime +/usr/bin/birdnet-go realtime & true + +# Wait for app to become available to start nginx +bashio::net.wait_for 8096 localhost 900 +bashio::log.info "Starting NGinx..." +exec nginx + diff --git a/birdnet-go/rootfs/etc/nginx/includes/mime.types b/birdnet-go/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/birdnet-go/rootfs/etc/nginx/includes/proxy_params.conf b/birdnet-go/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,16 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_hide_header X-Frame-Options; +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Host $http_host; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/birdnet-go/rootfs/etc/nginx/includes/resolver.conf b/birdnet-go/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..70f4982b9 --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11 ipv6=off; diff --git a/birdnet-go/rootfs/etc/nginx/includes/server_params.conf b/birdnet-go/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..09c06543e --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/birdnet-go/rootfs/etc/nginx/includes/ssl_params.conf b/birdnet-go/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/birdnet-go/rootfs/etc/nginx/includes/upstream.conf b/birdnet-go/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..a640ef18c --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8096; +} diff --git a/birdnet-go/rootfs/etc/nginx/nginx.conf b/birdnet-go/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..fb597811c --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,78 @@ + +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes auto; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 8192; +} + +http { + include /etc/nginx/includes/mime.types; + + # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/ + server_names_hash_bucket_size 64; + gzip_disable "msie6"; + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/rss+xml + image/svg+xml; + proxy_connect_timeout 1h; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/birdnet-go/rootfs/etc/nginx/servers/ingress.conf b/birdnet-go/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..6895e3d51 --- /dev/null +++ b/birdnet-go/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,29 @@ + server { + listen %%interface%%:%%port%% default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + proxy_buffering off; + + location / { + # Proxy pass + proxy_pass http://127.0.0.1:8080; + + # Allow downloading fragments + proxy_set_header Range $http_range; + proxy_set_header If-Range $http_if_range; + + # Next three lines allow websockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + proxy_hide_header X-Powered-By; + add_header X-Xss-Protection "1; mode=block"; + add_header X-Content-Type-Options "nosniff"; + add_header Strict-Transport-Security "max-age=2592000; includeSubdomains"; + add_header X-Frame-Options "SAMEORIGIN"; + add_header 'Referrer-Policy' 'no-referrer'; + } + +} diff --git a/emby/config.json b/emby/config.json index c63484aee..9a831105e 100644 --- a/emby/config.json +++ b/emby/config.json @@ -73,7 +73,7 @@ ], "host_network": true, "image": "ghcr.io/alexbelgium/emby-{arch}", - "ingress": true, + "ingress": true,b "ingress_port": 0, "ingress_stream": true, "init": false,