From be77f99548d6e208fdd98f1faf74481130e79ee9 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 8 Feb 2022 13:58:52 -0600 Subject: [PATCH] Account for subfolders in *warden --- bitwarden.subdomain.conf.sample | 8 +++--- bitwarden.subfolder.conf.sample | 27 +++++++++++++++++--- vaultwarden.subdomain.conf.sample | 8 +++--- vaultwarden.subfolder.conf.sample | 41 +++++++++++++++++++++++-------- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample index 40206f7..5824530 100644 --- a/bitwarden.subdomain.conf.sample +++ b/bitwarden.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2021/05/18 +## Version 2022/02/08 # 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 @@ -40,7 +40,7 @@ server { } - location /admin { + location ~ (/bitwarden)?/admin { # enable the next two lines for http auth #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; @@ -61,7 +61,7 @@ server { } - location /notifications/hub { + location ~ (/bitwarden)?/notifications/hub { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app bitwarden; @@ -71,7 +71,7 @@ server { } - location /notifications/hub/negotiate { + location ~ (/bitwarden)?/notifications/hub/negotiate { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app bitwarden; diff --git a/bitwarden.subfolder.conf.sample b/bitwarden.subfolder.conf.sample index aa47513..7205be5 100644 --- a/bitwarden.subfolder.conf.sample +++ b/bitwarden.subfolder.conf.sample @@ -1,4 +1,4 @@ -## Version 2021/05/18 +## Version 2022/02/08 ## Environmental Variable DOMAIN=https:///bitwarden must be set in bitwarden container including subfolder. ## This is using ports 80 and 3012 location /bitwarden { @@ -26,7 +26,28 @@ location ^~ /bitwarden/ { } -location /notifications/hub { +location ~ (/bitwarden)?/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; + include /config/nginx/resolver.conf; + set $upstream_app vaultwarden; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} + +location ~ (/bitwarden)?/notifications/hub { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app bitwarden; @@ -36,7 +57,7 @@ location /notifications/hub { } -location /notifications/hub/negotiate { +location ~ (/bitwarden)?/notifications/hub/negotiate { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app bitwarden; diff --git a/vaultwarden.subdomain.conf.sample b/vaultwarden.subdomain.conf.sample index 48b93cb..53769c3 100644 --- a/vaultwarden.subdomain.conf.sample +++ b/vaultwarden.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2021/05/18 +## Version 2022/02/08 # make sure that your dns has a cname set for vaultwarden and that your vaultwarden container is not using a base url # make sure your vaultwarden container is named "vaultwarden" # set the environment variable WEBSOCKET_ENABLED=true on your vaultwarden container @@ -40,7 +40,7 @@ server { } - location /admin { + location ~ (/vaultwarden)?/admin { # enable the next two lines for http auth #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; @@ -61,7 +61,7 @@ server { } - location /notifications/hub { + location ~ (/vaultwarden)?/notifications/hub { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app vaultwarden; @@ -71,7 +71,7 @@ server { } - location /notifications/hub/negotiate { + location ~ (/vaultwarden)?/notifications/hub/negotiate { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app vaultwarden; diff --git a/vaultwarden.subfolder.conf.sample b/vaultwarden.subfolder.conf.sample index ff527c3..456f928 100644 --- a/vaultwarden.subfolder.conf.sample +++ b/vaultwarden.subfolder.conf.sample @@ -1,4 +1,4 @@ -## Version 2021/05/18 +## Version 2022/02/08 ## Environmental Variable DOMAIN=https:///vaultwarden must be set in vaultwarden container including subfolder. ## This is using ports 80 and 3012 location /vaultwarden { @@ -26,17 +26,38 @@ location ^~ /vaultwarden/ { } -location /notifications/hub { - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app vaultwarden; - set $upstream_port 3012; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; +location ~ (/vaultwarden)?/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; -location /notifications/hub/negotiate { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app vaultwarden; + set $upstream_port 80; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} + +location ~ (/vaultwarden)?/notifications/hub { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app vaultwarden; + set $upstream_port 3012; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} + +location ~ (/vaultwarden)?/notifications/hub/negotiate { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app vaultwarden;