diff --git a/tandoor_recipes/rootfs/etc/nginx/includes/mime.types b/tandoor_recipes/rootfs/etc/nginx/includes/mime.types index 3e60dfdc6..7c7cdef2d 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/mime.types +++ b/tandoor_recipes/rootfs/etc/nginx/includes/mime.types @@ -1,96 +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; -} +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 index cf0823c13..1990d4959 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf +++ b/tandoor_recipes/rootfs/etc/nginx/includes/proxy_params.conf @@ -1,15 +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; +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 index 30416e729..6485af141 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf +++ b/tandoor_recipes/rootfs/etc/nginx/includes/resolver.conf @@ -1 +1 @@ -resolver 127.0.0.11; +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 index 7e90e5b6d..09c06543e 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf +++ b/tandoor_recipes/rootfs/etc/nginx/includes/server_params.conf @@ -1,6 +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; +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 index 6b2be0f59..6f1500599 100644 --- a/tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf +++ b/tandoor_recipes/rootfs/etc/nginx/includes/ssl_params.conf @@ -1,9 +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; +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 index 42abebbda..6d99eb7bc 100644 --- a/tandoor_recipes/rootfs/etc/nginx/nginx.conf +++ b/tandoor_recipes/rootfs/etc/nginx/nginx.conf @@ -1,55 +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; -} +# 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 index ca77cfa8a..a34a3cf16 100644 --- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf +++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf @@ -1,70 +1,70 @@ -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 / { - # Security - ###################### - allow 172.30.32.2; - deny all; - proxy_hide_header "X-Content-Type-Options"; - - # Base - ###################### - #proxy_bind $server_addr; - proxy_pass http://127.0.0.1:8080; - proxy_set_header Connection "Upgrade"; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_read_timeout 30; - - # Avoid mixed contents - ###################### - if ($http_referer ~* "^(http[s]?)://([^:]+):(\d*)(/.*)$") - { - set $x_scheme $1; - set $x_host $2; - set $x_port ":$3"; - } - if ($http_referer ~* "^(http[s]?)://([^:]+)(/.*)$") - { - set $x_scheme $1; - set $x_host $2; - set $x_port ""; - } - proxy_set_header X-Scheme $x_scheme; - proxy_redirect http://$host/ $x_scheme://$x_host$x_port/; - proxy_redirect $x_scheme://$host/ $x_scheme://$x_host$x_port/; - - # Allow subpath - ###################### - proxy_set_header X-Script-Name %%ingress_entry%%; - proxy_cookie_path / %%ingress_entry%%/; - - # Allow iframe - ###################### - proxy_hide_header "Content-Security-Policy"; - proxy_hide_header X-Frame-Options; - add_header Access-Control-Allow-Origin *; - proxy_set_header Accept-Encoding ""; - - # Rewrite url - ###################### - sub_filter_once off; - sub_filter_types *; - sub_filter "/static" "%%ingress_entry%%/static"; - sub_filter "/media" "%%ingress_entry%%/media"; - sub_filter "/view" "%%ingress_entry%%/view"; - sub_filter "/search" "%%ingress_entry%%/search"; - sub_filter "/edit" "%%ingress_entry%%/edit"; - #sub_filter "%%ingress_entry%%/%%ingress_entry%%/" "/"; - #sub_filter "/api" "%%ingress_entry%%/api"; - #sub_filter "%%ingress_entry%%/api/hassio" "/api/hassio"; - - } - -} +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 / { + # Security + ###################### + allow 172.30.32.2; + deny all; + proxy_hide_header "X-Content-Type-Options"; + + # Base + ###################### + #proxy_bind $server_addr; + proxy_pass http://127.0.0.1:8080; + proxy_set_header Connection "Upgrade"; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_buffering off; + proxy_read_timeout 30; + + # Avoid mixed contents + ###################### + if ($http_referer ~* "^(http[s]?)://([^:]+):(\d*)(/.*)$") + { + set $x_scheme $1; + set $x_host $2; + set $x_port ":$3"; + } + if ($http_referer ~* "^(http[s]?)://([^:]+)(/.*)$") + { + set $x_scheme $1; + set $x_host $2; + set $x_port ""; + } + proxy_set_header X-Scheme $x_scheme; + proxy_redirect http://$host/ $x_scheme://$x_host$x_port/; + proxy_redirect $x_scheme://$host/ $x_scheme://$x_host$x_port/; + + # Allow subpath + ###################### + proxy_set_header X-Script-Name %%ingress_entry%%; + proxy_cookie_path / %%ingress_entry%%/; + + # Allow iframe + ###################### + proxy_hide_header "Content-Security-Policy"; + proxy_hide_header X-Frame-Options; + add_header Access-Control-Allow-Origin *; + proxy_set_header Accept-Encoding ""; + + # Rewrite url + ###################### + sub_filter_once off; + sub_filter_types *; + sub_filter "/static" "%%ingress_entry%%/static"; + sub_filter "/media" "%%ingress_entry%%/media"; + sub_filter "/view" "%%ingress_entry%%/view"; + sub_filter "/search" "%%ingress_entry%%/search"; + sub_filter "/edit" "%%ingress_entry%%/edit"; + #sub_filter "%%ingress_entry%%/%%ingress_entry%%/" "/"; + #sub_filter "/api" "%%ingress_entry%%/api"; + #sub_filter "%%ingress_entry%%/api/hassio" "/api/hassio"; + + } + +}