diff --git a/maintainerr/CHANGELOG.md b/maintainerr/CHANGELOG.md index 4deeccf1e..bc4c6d792 100644 --- a/maintainerr/CHANGELOG.md +++ b/maintainerr/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.2.0-5 (02-04-2026) +- Add Home Assistant ingress support with nginx reverse proxy + ## 3.2.0-4 (02-04-2026) - Minor bugs fixed diff --git a/maintainerr/Dockerfile b/maintainerr/Dockerfile index 4fbe78286..52328ed68 100644 --- a/maintainerr/Dockerfile +++ b/maintainerr/Dockerfile @@ -81,6 +81,13 @@ ARG MODULES="00-banner.sh 01-custom_script.sh" COPY ha_automodules.sh /ha_automodules.sh RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh +# Manual apps +ENV PACKAGES="nginx" + +# Automatic apps & bashio +COPY ha_autoapps.sh /ha_autoapps.sh +RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh + ################ # 4 Entrypoint # ################ diff --git a/maintainerr/config.yaml b/maintainerr/config.yaml index 77cda8764..eaf441c01 100644 --- a/maintainerr/config.yaml +++ b/maintainerr/config.yaml @@ -68,6 +68,8 @@ devices: environment: DATA_DIR: "/config" image: ghcr.io/alexbelgium/maintainerr-{arch} +ingress: true +ingress_stream: true init: false panel_icon: mdi:movie-search map: @@ -87,5 +89,5 @@ schema: TZ: str? slug: maintainerr url: https://github.com/alexbelgium/hassio-addons/tree/master/maintainerr -version: "3.2.0-4" +version: "3.2.0-5" webui: "[PROTO:ssl]://[HOST]:[PORT:6246]" diff --git a/maintainerr/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/maintainerr/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100644 index 000000000..abb012724 --- /dev/null +++ b/maintainerr/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -0,0 +1,22 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e + +################# +# NGINX SETTING # +################# + +declare ingress_interface +declare ingress_port + +bashio::log.info "Configuring NGinx for ingress..." + +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +ingress_entry=$(bashio::addon.ingress_entry) + +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 + +bashio::log.info "NGinx ingress configured on ${ingress_interface}:${ingress_port}" diff --git a/maintainerr/rootfs/etc/nginx/includes/mime.types b/maintainerr/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/maintainerr/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/maintainerr/rootfs/etc/nginx/includes/proxy_params.conf b/maintainerr/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..e4c6eab14 --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,14 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Host $http_host; +proxy_set_header Upgrade $http_upgrade; +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/maintainerr/rootfs/etc/nginx/includes/resolver.conf b/maintainerr/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..70f4982b9 --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11 ipv6=off; diff --git a/maintainerr/rootfs/etc/nginx/includes/server_params.conf b/maintainerr/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..a0ff6baa0 --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,5 @@ +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/maintainerr/rootfs/etc/nginx/includes/ssl_params.conf b/maintainerr/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6cf1b5a3e --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2 TLSv1.3; +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/maintainerr/rootfs/etc/nginx/includes/upstream.conf b/maintainerr/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..b13371263 --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:6246; +} diff --git a/maintainerr/rootfs/etc/nginx/nginx.conf b/maintainerr/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..7e5bc6f7c --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,56 @@ +# 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 1; + +# 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 512; +} + +http { + include /etc/nginx/includes/mime.types; + + 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/maintainerr/rootfs/etc/nginx/servers/ingress.conf b/maintainerr/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..0c793020f --- /dev/null +++ b/maintainerr/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,61 @@ +server { + listen %%interface%%:%%port%% default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + proxy_buffering off; + gzip_static off; + client_max_body_size 0; + + # Based on https://docs.maintainerr.info/ReverseProxy/#nginx-subdomain + location / { + set $app '%%ingress_entry%%'; + + rewrite ^%%ingress_entry%%/?(.*)$ /$1 break; + proxy_pass http://127.0.0.1:6246; + + # WebSocket support + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + 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; + add_header X-Frame-Options "SAMEORIGIN"; + add_header 'Referrer-Policy' 'no-referrer'; + + # Redirect location headers + absolute_redirect off; + proxy_redirect / $app/; + + # Sub filters to rewrite URLs in responses + sub_filter_once off; + sub_filter_types *; + + # HTML attribute rewrites + sub_filter 'href="/"' 'href="%%ingress_entry%%/"'; + sub_filter 'src="/' 'src="%%ingress_entry%%/'; + sub_filter 'action="/' 'action="%%ingress_entry%%/'; + + # API path rewrites + sub_filter '"/api' '"%%ingress_entry%%/api'; + sub_filter '`/api' '`%%ingress_entry%%/api'; + sub_filter "'/api" "'%%ingress_entry%%/api"; + + # Vite asset rewrites + sub_filter '"/assets' '"%%ingress_entry%%/assets'; + sub_filter '`/assets' '`%%ingress_entry%%/assets'; + sub_filter "'/assets" "'%%ingress_entry%%/assets"; + + # Favicon and static files + sub_filter '"/favicon' '"%%ingress_entry%%/favicon'; + sub_filter '"/logo' '"%%ingress_entry%%/logo'; + + # Root path references in JavaScript + sub_filter '"\/"' '"%%ingress_entry%%\/"'; + } +} diff --git a/maintainerr/rootfs/ha_entrypoint.sh b/maintainerr/rootfs/ha_entrypoint.sh index 40b2f0cbd..c37814804 100755 --- a/maintainerr/rootfs/ha_entrypoint.sh +++ b/maintainerr/rootfs/ha_entrypoint.sh @@ -18,8 +18,10 @@ if [ -d /etc/cont-init.d ]; then for script in /etc/cont-init.d/*.sh; do [ -f "$script" ] || continue echo "[Maintainerr] Running init script: $script" - # Use bash directly (no S6 with-contenv available) - bash "$script" + # Source the script so it inherits bashio functions from bashio-standalone. + # Using bash "$script" would spawn a new process without bashio:: functions, + # causing "command not found" failures under set -e. + source "$script" done fi @@ -58,4 +60,32 @@ export DATA_DIR # ─── Start Maintainerr as unprivileged node user ───────────────────────────── echo "[Maintainerr] Starting application on port ${UI_PORT:-6246}..." -exec gosu node /opt/app/start.sh +gosu node /opt/app/start.sh & +APP_PID=$! + +cleanup() { + if [ -n "${APP_PID:-}" ] && ps -p "$APP_PID" >/dev/null 2>&1; then + kill "$APP_PID" 2>/dev/null || true + wait "$APP_PID" 2>/dev/null || true + fi +} +trap 'cleanup' EXIT TERM INT + +# ─── Wait for Maintainerr to become available, then start Nginx ────────────── +echo "[Maintainerr] Waiting for application to be ready..." +app_ready=0 +for _ in $(seq 1 900); do + if curl -s -o /dev/null -f "http://127.0.0.1:${UI_PORT:-6246}" 2>/dev/null; then + app_ready=1 + break + fi + sleep 1 +done + +if [ "$app_ready" -ne 1 ]; then + echo "[Maintainerr] ERROR: Application did not become ready within timeout. Aborting nginx startup." + # cleanup trap will handle stopping APP_PID if still running + exit 1 +fi +echo "[Maintainerr] Starting Nginx..." +exec nginx -c /etc/nginx/nginx.conf