Skip to content

Commit

Permalink
Cleanup redundant headers from proxy.conf
Browse files Browse the repository at this point in the history
Also general cleanup of whitespace
  • Loading branch information
nemchik committed Sep 1, 2020
1 parent 6449967 commit 54ede40
Show file tree
Hide file tree
Showing 60 changed files with 78 additions and 132 deletions.
2 changes: 1 addition & 1 deletion adguard.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ server {
set $upstream_port 80;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

}
}
1 change: 1 addition & 0 deletions adminer.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /adminer {
return 301 $scheme://$host/adminer/;
}

location ^~ /adminer/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
4 changes: 0 additions & 4 deletions bazarr.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}

location ~ (/bazarr)?/api {
Expand All @@ -47,7 +45,5 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}
}
5 changes: 1 addition & 4 deletions bazarr.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /bazarr {
return 301 $scheme://$host/bazarr/;
}

location ^~ /bazarr/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand All @@ -22,8 +23,6 @@ location ^~ /bazarr/ {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}

location ^~ /bazarr/api {
Expand All @@ -34,6 +33,4 @@ location ^~ /bazarr/api {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}
2 changes: 0 additions & 2 deletions beets.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ location /beets {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Scheme $scheme;
proxy_set_header X-Script-Name /beets;
}
27 changes: 23 additions & 4 deletions bitwarden.subdomain.conf.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# make sure that your dns has a cname set for bitwarden and that your bitwarden container is not using a base url
# make sure your bitwarden container is named "bitwarden"
# set the environment variable WEBSOCKET_ENABLED=true on your bitwarden container

server {
listen 443 ssl;
Expand Down Expand Up @@ -38,16 +39,35 @@ server {

}

location /notifications/hub {
location /admin {
# 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 bitwarden;
set $upstream_port 80;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
}

location /notifications/hub {
include /config/nginx/proxy.conf;
resolver 127.0.0.11 valid=30s;
set $upstream_app bitwarden;
set $upstream_port 3012;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

}

location /notifications/hub/negotiate {
Expand All @@ -59,5 +79,4 @@ server {
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

}

}
2 changes: 1 addition & 1 deletion bookstack.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

}
}
}
1 change: 1 addition & 0 deletions calibre-web.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /calibre-web {
return 301 $scheme://$host/calibre-web/;
}

location ^~ /calibre-web/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
2 changes: 0 additions & 2 deletions calibre.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@ server {
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_buffering off;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
}
}
1 change: 1 addition & 0 deletions calibre.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /calibre {
return 301 $scheme://$host/calibre/;
}

location ^~ /calibre/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
2 changes: 0 additions & 2 deletions code-server.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;

This comment has been minimized.

Copy link
@namorbrowneyes

namorbrowneyes Dec 30, 2020

My setup proves that this line is needed for code-server redirect to work correctly. Without it, a blank screen will show after entering password to login. FYI @nemchik

This comment has been minimized.

Copy link
@nemchik

nemchik Dec 30, 2020

Author Member
proxy_set_header Connection upgrade;

This comment has been minimized.

Copy link
@namorbrowneyes

namorbrowneyes Dec 30, 2020

My setup proves that this line is needed for code-server redirect to work correctly. Without it, a blank screen will show after entering password to login. FYI @nemchik

This comment has been minimized.

Copy link
@Roxedus

Roxedus Dec 30, 2020

Member
}
}
4 changes: 0 additions & 4 deletions collabora.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ server {
set $upstream_proto https;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_read_timeout 36000s;
}
Expand All @@ -74,8 +72,6 @@ server {
set $upstream_proto https;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_read_timeout 36000s;
}
Expand Down
1 change: 1 addition & 0 deletions deluge.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /deluge {
return 301 $scheme://$host/deluge/;
}

location ^~ /deluge/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
3 changes: 0 additions & 3 deletions documentserver.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ server {
set $upstream_port 80;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;

}
}
1 change: 1 addition & 0 deletions dozzle.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /dozzle {
return 301 $scheme://$host/dozzle/;
}

location ^~ /dozzle/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
1 change: 1 addition & 0 deletions duplicati.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /duplicati {
return 301 $scheme://$host/duplicati/;
}

location ^~ /duplicati/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
5 changes: 1 addition & 4 deletions emby.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,5 @@ server {

proxy_set_header Range $http_range;
proxy_set_header If-Range $http_if_range;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
}
}
}
3 changes: 1 addition & 2 deletions emby.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
location /emby {
return 301 $scheme://$host/emby/;
}

location ^~ /emby/ {
include /config/nginx/proxy.conf;
resolver 127.0.0.11 valid=30s;
Expand All @@ -28,6 +29,4 @@ location ^~ /embywebsocket {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
}
1 change: 1 addition & 0 deletions flood.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /flood {
return 301 $scheme://$host/flood/;
}

location ^~ /flood/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
1 change: 1 addition & 0 deletions glances.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /glances {
return 301 $scheme://$host/glances/;
}

location ^~ /glances/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
5 changes: 2 additions & 3 deletions gotify.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ server {
set $upstream_port 80;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

}
}
}
1 change: 0 additions & 1 deletion grocy.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ server {
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

}

}
1 change: 1 addition & 0 deletions guacamole.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /guacamole {
return 301 $scheme://$host/guacamole/;
}

location ^~ /guacamole/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
5 changes: 0 additions & 5 deletions homeassistant.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,5 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Host $host;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
}
4 changes: 1 addition & 3 deletions jellyfin.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@ server {
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
}
}
}
3 changes: 1 addition & 2 deletions jellyfin.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
location /jellyfin {
return 301 $scheme://$host/jellyfin/;
}

location ^~ /jellyfin/ {
include /config/nginx/proxy.conf;
resolver 127.0.0.11 valid=30s;
Expand All @@ -18,6 +19,4 @@ location ^~ /jellyfin/ {

proxy_set_header Range $http_range;
proxy_set_header If-Range $http_if_range;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
}
1 change: 1 addition & 0 deletions jenkins.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
location /jenkins {
return 301 $scheme://$host/jenkins/;
}

location ^~ /jenkins/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
1 change: 1 addition & 0 deletions kanzi.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /kanzi {
return 301 $scheme://$host/kanzi/;
}

location ^~ /kanzi/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
6 changes: 4 additions & 2 deletions mailu.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
location /admin{
return 301 $scheme://$host/admin/;
}

location ^~ /admin/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand All @@ -17,7 +18,7 @@ location ^~ /admin/ {

# 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 front;
Expand All @@ -30,6 +31,7 @@ location ^~ /admin/ {
location /webmail{
return 301 $scheme://$host/webmail/;
}

location ^~ /webmail/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand All @@ -41,7 +43,7 @@ location ^~ /webmail/ {

# 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 front;
Expand Down
2 changes: 0 additions & 2 deletions medusa.subdomain.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ server {
#include /config/nginx/authelia-location.conf;

include /config/nginx/proxy.conf;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
resolver 127.0.0.11 valid=30s;
set $upstream_app medusa;
set $upstream_port 8081;
Expand Down
2 changes: 0 additions & 2 deletions medusa.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ location ^~ /medusa {
#include /config/nginx/authelia-location.conf;

include /config/nginx/proxy.conf;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
resolver 127.0.0.11 valid=30s;
set $upstream_app medusa;
set $upstream_port 8081;
Expand Down
1 change: 1 addition & 0 deletions monitorr.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
location /monitorr {
return 301 $scheme://$host/monitorr/;
}

location ^~ /monitorr/ {
# enable the next two lines for http auth
#auth_basic "Restricted";
Expand Down
1 change: 1 addition & 0 deletions mytinytodo.subfolder.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
location /todo {
return 301 $scheme://$host/todo/;
}

location ^~ /todo/ {

# enable the next two lines for http auth
Expand Down
Loading

0 comments on commit 54ede40

Please sign in to comment.