mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-22 16:51:51 +02:00
Use embedded nginx https://github.com/alexbelgium/hassio-addons/issues/2567
This commit is contained in:
@@ -1,9 +1,5 @@
|
|||||||
## 26.3.16-4 (19-03-2026)
|
- Use embedded ingress system
|
||||||
- Minor bugs fixed
|
|
||||||
## 26.3.16-3 (18-03-2026)
|
|
||||||
- Minor bugs fixed
|
|
||||||
## 26.3.16-2 (17-03-2026)
|
|
||||||
- Minor bugs fixed
|
|
||||||
## 26.3.16-1 (17-03-2026)
|
## 26.3.16-1 (17-03-2026)
|
||||||
- Minor bugs fixed
|
- Minor bugs fixed
|
||||||
## 26.3.7-3 (07-03-2026)
|
## 26.3.7-3 (07-03-2026)
|
||||||
|
|||||||
@@ -42,4 +42,4 @@ slug: netalertx
|
|||||||
tmpfs: true
|
tmpfs: true
|
||||||
udev: true
|
udev: true
|
||||||
url: https://github.com/alexbelgium/hassio-addons
|
url: https://github.com/alexbelgium/hassio-addons
|
||||||
version: "26.3.16-4"
|
version: "26.3.16-5"
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
|
||||||
# shellcheck shell=bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
#################
|
|
||||||
# NGINX SETTING #
|
|
||||||
#################
|
|
||||||
|
|
||||||
declare ingress_interface
|
|
||||||
declare ingress_port
|
|
||||||
declare ingress_entry
|
|
||||||
|
|
||||||
echo "Adapting for ingress"
|
|
||||||
|
|
||||||
# Remove backend api url to use the base path
|
|
||||||
sed -i "s|'/server'|''|g" /app/back/app.conf
|
|
||||||
sed -i "s|gzip on|gzip off|g" /services/config/nginx/netalertx.conf.template
|
|
||||||
sed -i "s|(\$is_trusted != \"TRUSTED\")|(\$is_trusted = \"AAA\")|g" /services/config/nginx/netalertx.conf.template
|
|
||||||
|
|
||||||
# Adapt nginx configuration
|
|
||||||
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/http.d/ingress.conf
|
|
||||||
sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/http.d/ingress.conf
|
|
||||||
sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/http.d/ingress.conf
|
|
||||||
@@ -38,7 +38,6 @@ done
|
|||||||
# Fix php
|
# Fix php
|
||||||
sed -i 's|>>"\?/tmp/log/app\.php_errors\.log"\? 2>/dev/stderr|>>"/tmp/log/app.php_errors.log"|g' /services/start-php-fpm.sh
|
sed -i 's|>>"\?/tmp/log/app\.php_errors\.log"\? 2>/dev/stderr|>>"/tmp/log/app.php_errors.log"|g' /services/start-php-fpm.sh
|
||||||
sed -i 's|TEMP_CONFIG_FILE=$(mktemp "${TMP_DIR}/netalertx\.conf\.XXXXXX")|TEMP_CONFIG_FILE=$(mktemp -p "${TMP_DIR:-/tmp}" netalertx.conf.XXXXXX)|' /services/start-php-fpm.sh
|
sed -i 's|TEMP_CONFIG_FILE=$(mktemp "${TMP_DIR}/netalertx\.conf\.XXXXXX")|TEMP_CONFIG_FILE=$(mktemp -p "${TMP_DIR:-/tmp}" netalertx.conf.XXXXXX)|' /services/start-php-fpm.sh
|
||||||
sed -i "/default_type/a include /etc/nginx/http.d/ingress.conf;" "${SYSTEM_NGINX_CONFIG_TEMPLATE}"
|
|
||||||
|
|
||||||
#####################
|
#####################
|
||||||
# Configure network #
|
# Configure network #
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
map $http_upgrade $connection_upgrade {
|
|
||||||
default upgrade;
|
|
||||||
'' close;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen %%interface%%:%%port%% default_server;
|
|
||||||
server_name netalertx;
|
|
||||||
proxy_buffering off;
|
|
||||||
|
|
||||||
include /etc/nginx/includes/server_params.conf;
|
|
||||||
include /etc/nginx/includes/proxy_params.conf;
|
|
||||||
|
|
||||||
location ~ ^/php%%ingress_entry%%/(.*)$ {
|
|
||||||
rewrite ^/php%%ingress_entry%%/(.*)$ /php/$1 break;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://127.0.0.1:20211/;
|
|
||||||
|
|
||||||
rewrite ^%%ingress_entry%%/?(.*)$ /$1 break;
|
|
||||||
|
|
||||||
sub_filter_once off;
|
|
||||||
sub_filter_types *;
|
|
||||||
|
|
||||||
sub_filter '"/server' '"%%ingress_entry%%/server';
|
|
||||||
sub_filter 'href="/' 'href="%%ingress_entry%%/';
|
|
||||||
sub_filter 'src="/' 'src="%%ingress_entry%%/';
|
|
||||||
sub_filter 'action="/' 'action="%%ingress_entry%%/';
|
|
||||||
sub_filter '(?>$host)/css/' '%%ingress_entry%%/css/';
|
|
||||||
sub_filter '(?>$host)/js/' '%%ingress_entry%%/js/';
|
|
||||||
sub_filter '/img/' '%%ingress_entry%%/img/';
|
|
||||||
sub_filter '/lib/' '%%ingress_entry%%/lib/';
|
|
||||||
sub_filter '/php/' '%%ingress_entry%%/php/';
|
|
||||||
# sub_filter '"/server"' '"%%ingress_entry%%/server"';
|
|
||||||
# sub_filter "'/server'" "'%%ingress_entry%%/server'";
|
|
||||||
# sub_filter "fetch(sseUrl" "fetch(%%ingress_entry%%sseUrl";
|
|
||||||
|
|
||||||
# Websocket support
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
|
|
||||||
proxy_set_header Range $http_range;
|
|
||||||
proxy_set_header If-Range $http_if_range;
|
|
||||||
|
|
||||||
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_connect_timeout 30m;
|
|
||||||
proxy_send_timeout 30m;
|
|
||||||
proxy_read_timeout 30m;
|
|
||||||
|
|
||||||
add_header X-Frame-Options "SAMEORIGIN";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
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;
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
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;
|
|
||||||
Reference in New Issue
Block a user