From 40c3201507e523e1b898c2fd554113abda48209c Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 29 Jun 2022 15:42:09 +0200 Subject: [PATCH] ingress --- tandoor_recipes/CHANGELOG.md | 1 + tandoor_recipes/Dockerfile | 2 +- tandoor_recipes/config.json | 7 +- .../rootfs/etc/cont-init.d/20-folders.sh | 2 +- .../rootfs/etc/cont-init.d/32-ingress.sh | 15 +++ .../rootfs/etc/cont-init.d/99-run.sh | 5 +- .../rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 15 +++ .../rootfs/etc/nginx/includes/resolver.conf | 1 + .../etc/nginx/includes/server_params.conf | 6 ++ .../rootfs/etc/nginx/includes/ssl_params.conf | 9 ++ tandoor_recipes/rootfs/etc/nginx/nginx.conf | 55 +++++++++++ .../rootfs/etc/nginx/servers/ingress.conf | 32 +++++++ 13 files changed, 240 insertions(+), 6 deletions(-) create mode 100644 tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh create mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/mime.types create mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf create mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf create mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 tandoor_recipes/rootfs/etc/nginx/nginx.conf create mode 100644 tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index 345fad7f1..9cc2e5a2f 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,3 +1,4 @@ +- Ingress addition ## 1.2.7 (26-05-2022) - Update to latest version from TandoorRecipes/recipes diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 831cbcab9..68d1ca595 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -47,7 +47,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE # Manual apps -ENV PACKAGES="" +ENV PACKAGES="nginx" # Automatic apps & bashio RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 135f24f6f..35b653cd1 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -11,6 +11,7 @@ "DEBUG": "0", "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db" }, + "ingress": true, "map": [ "config:rw" ], @@ -20,6 +21,7 @@ "DB_TYPE": "sqlite", "SECRET_KEY": "YOUR_SECRET_KEY" }, + "panel_icon": "mdi:silverware-fork-knife", "ports": { "8080/tcp": 9928 }, @@ -41,6 +43,5 @@ ], "slug": "tandoor_recipes", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.2.7", - "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" -} + "version": "1.2.7-ingress" +} \ No newline at end of file diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh b/tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh index bfefebf96..dbde57e2c 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/20-folders.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/usr/bin/bashio # shellcheck shell=bash slug="tandoor_recipes" diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh new file mode 100644 index 000000000..f181b00ca --- /dev/null +++ b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh @@ -0,0 +1,15 @@ +#!/usr/bin/bashio +# shellcheck shell=bash + +################# +# NGINX SETTING # +################# +declare ingress_interface +declare ingress_port + +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 diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index 2b2372432..aceb4475a 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/usr/bin/bashio # shellcheck shell=bash # shellcheck disable=SC2155 @@ -74,6 +74,9 @@ chmod 755 /data/recipes/staticfiles ln -s /config/addons_config/tandoor_recipes/mediafiles /opt/recipes ln -s /data/recipes/staticfiles /opt/recipes +bashio::log.info "Launching nginx" +exec nginx & echo "done" + bashio::log.info "Launching app" cd /opt/recipes || exit ./boot.sh diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/mime.types b/tandoor_recipes/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..3e60dfdc6 --- /dev/null +++ b/tandoor_recipes/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/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf b/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..cf0823c13 --- /dev/null +++ b/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +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_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/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf b/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..30416e729 --- /dev/null +++ b/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf b/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..7e90e5b6d --- /dev/null +++ b/tandoor_recipes/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/tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf b/tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6b2be0f59 --- /dev/null +++ b/tandoor_recipes/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/tandoor_recipes/rootfs/etc/nginx/nginx.conf b/tandoor_recipes/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..42abebbda --- /dev/null +++ b/tandoor_recipes/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,55 @@ +# 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/servers/*.conf; +} diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..c317d8bf7 --- /dev/null +++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,32 @@ +server { + listen %%interface%%:%%port%% default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + client_max_body_size 0; + + location / { + proxy_pass http://127.0.0.1:8080; + proxy_buffering off; + proxy_read_timeout 30; + proxy_set_header Connection "Upgrade"; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Host $http_host; # try $host instead if this doesn't work + proxy_set_header X-Forwarded-Proto $scheme; # http or https + + # Allow ingress subpath + proxy_set_header X-Script-Name %%ingress_entry%%/; + proxy_cookie_path / %%ingress_entry%%/; + + # Rewrite url + sub_filter_once off; + sub_filter_types *; + sub_filter "/static" "%%ingress_entry%%/static"; + + # Allow frames + proxy_hide_header "Content-Security-Policy"; + add_header X-Frame-Options SAMEORIGIN; + add_header Access-Control-Allow-Origin *; + proxy_set_header Accept-Encoding ""; + } +} +