diff --git a/boinc.subdomain.conf.sample b/boinc.subdomain.conf.sample index 6cef0b2..e235b0f 100644 --- a/boinc.subdomain.conf.sample +++ b/boinc.subdomain.conf.sample @@ -29,12 +29,12 @@ server { #include /config/nginx/authelia-location.conf; include /config/nginx/proxy.conf; - proxy_buffering off; resolver 127.0.0.11 valid=30s; set $upstream_app boinc; set $upstream_port 8080; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + proxy_buffering off; } } diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample index dc922ae..bd98202 100644 --- a/calibre-web.subdomain.conf.sample +++ b/calibre-web.subdomain.conf.sample @@ -16,26 +16,25 @@ server { # enable for Authelia #include /config/nginx/authelia-server.conf; - location / { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; - # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf - #auth_request /auth; - #error_page 401 =200 /ldaplogin; + # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf + #auth_request /auth; + #error_page 401 =200 /ldaplogin; # enable for Authelia #include /config/nginx/authelia-location.conf; - include /config/nginx/proxy.conf; - resolver 127.0.0.11 valid=30s; - set $upstream_app calibre-web; - set $upstream_port 8083; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; + include /config/nginx/proxy.conf; + resolver 127.0.0.11 valid=30s; + set $upstream_app calibre-web; + set $upstream_port 8083; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $http_host; - proxy_set_header X-Scheme $scheme; - } + proxy_set_header X-Scheme $scheme; + } } diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample index 15f54f2..ac4d741 100644 --- a/calibre-web.subfolder.conf.sample +++ b/calibre-web.subfolder.conf.sample @@ -16,13 +16,13 @@ location ^~ /calibre-web/ { # enable for Authelia, also enable authelia-server.conf in the default site config #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app calibre-web; set $upstream_port 8083; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $http_host; proxy_set_header X-Scheme $scheme; proxy_set_header X-Script-Name /calibre-web; } diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample index d1c5fc7..66555dc 100644 --- a/calibre.subdomain.conf.sample +++ b/calibre.subdomain.conf.sample @@ -28,6 +28,7 @@ server { # enable for Authelia #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app calibre; set $upstream_port 8080; diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample index cf4f7ae..f5be5f2 100644 --- a/calibre.subfolder.conf.sample +++ b/calibre.subfolder.conf.sample @@ -16,6 +16,7 @@ location ^~ /calibre/ { # enable for Authelia, also enable authelia-server.conf in the default site config #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app calibre; set $upstream_port 8080; diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample index 4282b31..738a84e 100644 --- a/collabora.subdomain.conf.sample +++ b/collabora.subdomain.conf.sample @@ -8,71 +8,32 @@ server { include /config/nginx/ssl.conf; - # static files - location ^~ /loleaflet { + client_max_body_size 0; + + # enable for ldap auth, fill in ldap details in ldap.conf + #include /config/nginx/ldap.conf; + + # enable for Authelia + #include /config/nginx/authelia-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable the next two lines for ldap auth + #auth_request /auth; + #error_page 401 =200 /ldaplogin; + + # enable for Authelia + #include /config/nginx/authelia-location.conf; + + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app collabora; set $upstream_port 9980; set $upstream_proto https; proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $http_host; - } - - # WOPI discovery URL - location ^~ /hosting/discovery { - resolver 127.0.0.11 valid=30s; - set $upstream_app collabora; - set $upstream_port 9980; - set $upstream_proto https; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - proxy_set_header Host $http_host; - } - - # Capabilities - location ^~ /hosting/capabilities { - resolver 127.0.0.11 valid=30s; - set $upstream_app collabora; - set $upstream_port 9980; - set $upstream_proto https; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - proxy_set_header Host $http_host; - } - - # main websocket - location ~ ^/lool/(.*)/ws$ { - resolver 127.0.0.11 valid=30s; - set $upstream_app collabora; - set $upstream_port 9980; - set $upstream_proto https; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - proxy_set_header Host $http_host; - proxy_read_timeout 36000s; - } - - # download, presentation and image upload - location ~ ^/lool { - resolver 127.0.0.11 valid=30s; - set $upstream_app collabora; - set $upstream_port 9980; - set $upstream_proto https; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - proxy_set_header Host $http_host; - } - - # Admin Console websocket - location ^~ /lool/adminws { - resolver 127.0.0.11 valid=30s; - set $upstream_app collabora; - set $upstream_port 9980; - set $upstream_proto https; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - proxy_set_header Host $http_host; - proxy_read_timeout 36000s; } } diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample index 8112e1e..87f5c4f 100644 --- a/dozzle.subfolder.conf.sample +++ b/dozzle.subfolder.conf.sample @@ -17,13 +17,13 @@ location ^~ /dozzle/ { #include /config/nginx/authelia-location.conf; include /config/nginx/proxy.conf; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; resolver 127.0.0.11 valid=30s; set $upstream_app dozzle; set $upstream_port 8080; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; } diff --git a/duplicati.subdomain.conf.sample b/duplicati.subdomain.conf.sample index 69e8edc..45601f9 100644 --- a/duplicati.subdomain.conf.sample +++ b/duplicati.subdomain.conf.sample @@ -28,6 +28,7 @@ server { # enable for Authelia #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app duplicati; set $upstream_port 8200; diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample index acc40ca..efeae10 100644 --- a/duplicati.subfolder.conf.sample +++ b/duplicati.subfolder.conf.sample @@ -16,6 +16,7 @@ location ^~ /duplicati/ { # enable for Authelia, also enable authelia-server.conf in the default site config #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app duplicati; set $upstream_port 8200; diff --git a/guacamole.subdomain.conf.sample b/guacamole.subdomain.conf.sample index 676b538..0cf0364 100644 --- a/guacamole.subdomain.conf.sample +++ b/guacamole.subdomain.conf.sample @@ -29,12 +29,12 @@ server { #include /config/nginx/authelia-location.conf; include /config/nginx/proxy.conf; - proxy_buffering off; resolver 127.0.0.11 valid=30s; set $upstream_app guacamole; set $upstream_port 8080; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + proxy_buffering off; } } diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample index 30a07ee..8c3ac0e 100644 --- a/guacamole.subfolder.conf.sample +++ b/guacamole.subfolder.conf.sample @@ -17,12 +17,12 @@ location ^~ /guacamole/ { #include /config/nginx/authelia-location.conf; include /config/nginx/proxy.conf; - proxy_buffering off; resolver 127.0.0.11 valid=30s; set $upstream_app guacamole; set $upstream_port 8080; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + proxy_buffering off; rewrite /guacamole(.*) $1 break; } diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample index 6607db5..4dce950 100644 --- a/jenkins.subfolder.conf.sample +++ b/jenkins.subfolder.conf.sample @@ -17,20 +17,18 @@ location ^~ /jenkins/ { # enable for Authelia, also enable authelia-server.conf in the default site config #include /config/nginx/authelia-location.conf; - # This is the maximum upload size - client_max_body_size 10m; - - sendfile off; - include /config/nginx/proxy.conf; - proxy_max_temp_file_size 0; - proxy_temp_file_write_size 64k; - proxy_request_buffering off; - proxy_buffering off; resolver 127.0.0.11 valid=30s; set $upstream_app jenkins; set $upstream_port 8080; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + # This is the maximum upload size + client_max_body_size 10m; + sendfile off; + proxy_max_temp_file_size 0; + proxy_temp_file_write_size 64k; + proxy_request_buffering off; + proxy_buffering off; } diff --git a/mailu.subdomain.conf.sample b/mailu.subdomain.conf.sample index 5536247..ef7813f 100644 --- a/mailu.subdomain.conf.sample +++ b/mailu.subdomain.conf.sample @@ -27,7 +27,7 @@ server { # enable for Authelia #include /config/nginx/authelia-location.conf; - + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app front; diff --git a/mstream.subdomain.conf.sample b/mstream.subdomain.conf.sample index 0154e09..71c4836 100644 --- a/mstream.subdomain.conf.sample +++ b/mstream.subdomain.conf.sample @@ -28,7 +28,7 @@ server { # enable for Authelia #include /config/nginx/authelia-location.conf; - include /config/nginx/proxy.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app mstream; set $upstream_port 3000; diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample index cf92430..ab75158 100644 --- a/nextcloud.subfolder.conf.sample +++ b/nextcloud.subfolder.conf.sample @@ -33,9 +33,8 @@ location ^~ /nextcloud/ { rewrite /nextcloud(.*) $1 break; proxy_max_temp_file_size 2048m; - proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; - proxy_redirect off; + proxy_redirect off; proxy_ssl_session_reuse off; } diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample index bbc57d5..b029f17 100644 --- a/organizr-auth.subfolder.conf.sample +++ b/organizr-auth.subfolder.conf.sample @@ -21,6 +21,7 @@ location ~ /auth-([0-9]+) { set $upstream_auth_port 80; set $upstream_auth_proto http; proxy_pass $upstream_auth_proto://$upstream_auth_app:$upstream_auth_port/api/?v1/auth&group=$1; + proxy_set_header Content-Length ""; # Do not uncomment the lines below, these are examples for usue in other proxy configs diff --git a/sickchill.subdomain.conf.sample b/sickchill.subdomain.conf.sample index f282673..4c82a9a 100644 --- a/sickchill.subdomain.conf.sample +++ b/sickchill.subdomain.conf.sample @@ -35,7 +35,5 @@ server { set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; } } diff --git a/sickchill.subfolder.conf.sample b/sickchill.subfolder.conf.sample index 6b96055..a1c992a 100644 --- a/sickchill.subfolder.conf.sample +++ b/sickchill.subfolder.conf.sample @@ -19,7 +19,4 @@ location ^~ /sickchill { set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; - } diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample index 57e788a..a84acb4 100644 --- a/tt-rss.subdomain.conf.sample +++ b/tt-rss.subdomain.conf.sample @@ -29,6 +29,7 @@ server { # enable for Authelia #include /config/nginx/authelia-location.conf; + include /config/nginx/proxy.conf; resolver 127.0.0.11 valid=30s; set $upstream_app tt-rss; set $upstream_port 80; @@ -36,9 +37,5 @@ server { proxy_pass $upstream_proto://$upstream_app:$upstream_port; proxy_redirect http://$upstream_app:80 /; - proxy_read_timeout 60s; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } }