From 0659b438444b5eed3404813f463bf5f3a7192765 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:27:01 +0100 Subject: [PATCH] Test remove nginx https://github.com/alexbelgium/hassio-addons/issues/1207 --- tandoor_recipes/CHANGELOG.md | 1 + tandoor_recipes/Dockerfile | 2 +- tandoor_recipes/config.json | 2 +- .../rootfs/etc/cont-init.d/32-ingress.sh | 22 ---- .../rootfs/etc/cont-init.d/32-nginx.sh | 21 ---- .../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 | 5 - .../rootfs/etc/nginx/includes/ssl_params.conf | 9 -- tandoor_recipes/rootfs/etc/nginx/nginx.conf | 55 --------- .../rootfs/etc/nginx/servers/ingress.conf | 112 ------------------ .../rootfs/etc/nginx/servers/ssl.conf | 28 ----- .../rootfs/etc/services.d/nginx/finish | 8 -- .../rootfs/etc/services.d/nginx/run | 9 -- 15 files changed, 3 insertions(+), 383 deletions(-) delete mode 100755 tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh delete mode 100755 tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh delete mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/mime.types delete mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/nginx.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf delete mode 100644 tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf delete mode 100644 tandoor_recipes/rootfs/etc/services.d/nginx/finish delete mode 100644 tandoor_recipes/rootfs/etc/services.d/nginx/run diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index aa006c6c7..08a117a0e 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,3 +1,4 @@ +- Removed custom nginx (https://github.com/alexbelgium/hassio-addons/issues/1207) ## 1.5.11 (20-01-2024) - Update to latest version from TandoorRecipes/recipes diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 64a1ae78b..727c496fe 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -42,7 +42,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="nginx mysql-client" +ENV PACKAGES="mysql-client" # Automatic apps & bashio ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 3f1f10d29..da1df0142 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -111,6 +111,6 @@ "slug": "tandoor_recipes", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.5.11", + "version": "1.5.11-test", "webui": "http://[HOST]:[PORT:8080]" } diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh deleted file mode 100755 index de22468fe..000000000 --- a/tandoor_recipes/rootfs/etc/cont-init.d/32-ingress.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/bashio -# shellcheck shell=bash -set -e - -if [[ -n "${DISABLE_INGRESS}" ]]; then - bashio::log.info "Ingress disabled" - sed -i "/nginx/d" /etc/cont-init.d/99-run.sh - exit 0 -fi - -################# -# 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/32-nginx.sh b/tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh deleted file mode 100755 index a1f98acc8..000000000 --- a/tandoor_recipes/rootfs/etc/cont-init.d/32-nginx.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/bashio -# shellcheck shell=bash -set -e - -if bashio::config.true 'ssl'; then - - # Validate ssl - bashio::config.require.ssl - - # Adapt nginx template - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') - sed -i "s|%%certfile%%|${certfile}|g" /etc/nginx/servers/ssl.conf - sed -i "s|%%keyfile%%|${keyfile}|g" /etc/nginx/servers/ssl.conf - sed -i "s|8080;|8080 ssl;|g" /etc/nginx/servers/ssl.conf - -else - - sed -i "/ssl/d" /etc/nginx/servers/ssl.conf - -fi diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/mime.types b/tandoor_recipes/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -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 deleted file mode 100644 index c64000920..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,15 +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_set_header Host $http_host; -proxy_set_header Accept-Encoding ""; -proxy_set_header Connection $connection_upgrade; -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 deleted file mode 100644 index 70f4982b9..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11 ipv6=off; diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf b/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index a0ff6baa0..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 6f1500599..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 6d99eb7bc..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/nginx.conf +++ /dev/null @@ -1,55 +0,0 @@ -# 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 deleted file mode 100644 index 3a2f5202a..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,112 +0,0 @@ -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; - - root /opt/recipes/cookbook; - -location /switch-space/ { - proxy_pass http://127.0.0.1:8080/switch-space/; - - proxy_redirect "/" "%%ingress_entry%%/"; - - # Allow ingress subpath - #proxy_set_header X-Script-Name %%ingress_entry%%; - proxy_cookie_path / %%ingress_entry%%/; - - # Allow frames - add_header X-Frame-Options SAMEORIGIN; - add_header Access-Control-Allow-Origin *; - proxy_set_header Accept-Encoding ""; - - # avoid mixed content - # Ensure work with both http and https (code by @met67) - if ($http_referer ~* "^(http[s]?)://([^:]+):(\d*)(/.*)$") { - set $x_scheme $1; - set $x_host $2; - set $x_port ":$3"; - } - # Ensure works if standard port (code by @met67) - if ($http_referer ~* "^(http[s]?)://([^:]+)(/.*)$") { - set $x_scheme $1; - set $x_host $2; - set $x_port ""; - } - proxy_set_header X-Scheme $x_scheme; - proxy_set_header X-Host $x_host; - proxy_set_header X-Port $x_port; - proxy_set_header X-Forwarded-Proto $x_scheme; - - proxy_set_header Host $x_host$x_port; # Required for addresses without ports - - # Correct url without port when using https - absolute_redirect off; - sub_filter_once off; - sub_filter_types *; - sub_filter https://$x_host/ https://$x_host$x_port/; - sub_filter http://$x_host/ http://$x_host$x_port/; - sub_filter "/static" "%%ingress_entry%%/static"; - sub_filter "/media" "%%ingress_entry%%/media"; - sub_filter "http://127.0.0.1:8080/" "/"; -} - - 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; - - # Allow ingress subpath - proxy_set_header X-Script-Name %%ingress_entry%%; - proxy_cookie_path / %%ingress_entry%%/; - - # Allow frames - proxy_hide_header "Content-Security-Policy"; - add_header X-Frame-Options SAMEORIGIN; # Required for ingress frame - add_header Access-Control-Allow-Origin *; - proxy_set_header Accept-Encoding ""; - - # avoid mixed content - # Ensure work with both http and https (code by @met67) - if ($http_referer ~* "^(http[s]?)://([^:]+):(\d*)(/.*)$") { - set $x_scheme $1; - set $x_host $2; - set $x_port ":$3"; - } - # Ensure works if standard port (code by @met67) - if ($http_referer ~* "^(http[s]?)://([^:]+)(/.*)$") { - set $x_scheme $1; - set $x_host $2; - set $x_port ""; - } - proxy_set_header X-Scheme $x_scheme; - proxy_set_header X-Host $x_host; - proxy_set_header X-Port $x_port; - proxy_set_header X-Forwarded-Proto $x_scheme; - - proxy_set_header Host $x_host$x_port; # Required for addresses without ports - - # Correct url without port when using https - absolute_redirect off; - sub_filter_once off; - sub_filter_types *; - sub_filter https://$x_host/ https://$x_host$x_port/; - sub_filter http://$x_host/ http://$x_host$x_port/; - - # Rewrite url - sub_filter "/static" "%%ingress_entry%%/static"; - sub_filter "/media" "%%ingress_entry%%/media"; - sub_filter "http://127.0.0.1:8080/" "/"; - } - -location /media/ { - alias /config/addons_config/tandoor_recipes/mediafiles/; - } - -location /static/ { - alias /data/recipes/staticfiles/; - } - -} diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf deleted file mode 100644 index 68ba664bd..000000000 --- a/tandoor_recipes/rootfs/etc/nginx/servers/ssl.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - - listen 8080; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - ssl_certificate /ssl/%%certfile%%; - ssl_certificate_key /ssl/%%keyfile%%; - - location / { - # Proxy pass - proxy_pass http://127.0.0.1:8081; - - # Allow frames - add_header X-Frame-Options SAMEORIGIN; - add_header Access-Control-Allow-Origin *; - proxy_set_header Accept-Encoding ""; - proxy_set_header X-Forwarded-Proto $scheme; - - # Next three lines allow websockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - } - -} diff --git a/tandoor_recipes/rootfs/etc/services.d/nginx/finish b/tandoor_recipes/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/tandoor_recipes/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/tandoor_recipes/rootfs/etc/services.d/nginx/run b/tandoor_recipes/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 342b2ef69..000000000 --- a/tandoor_recipes/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e -# ============================================================================== - -bashio::net.wait_for "$port" localhost 8081 - -bashio::log.info "Starting NGinx..." -exec nginx