Skip to content

Commit

Permalink
clarify correct config for *warden
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Nemchik <eric@nemchik.com>
  • Loading branch information
nemchik committed Nov 12, 2023
1 parent 778c764 commit ddcc002
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 83 deletions.
14 changes: 9 additions & 5 deletions bitwarden.subdomain.conf.sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Version 2023/11/11
## Version 2023/11/12
# make sure that your bitwarden container is named bitwarden
# make sure that your dns has a cname set for bitwarden
# if you are using bitwarden (the official image), use the bitwarden conf
# if you are using vaultwarden (an unofficial implementation), use the vaultwarden conf
#
# bitwarden defaults to port 8080 and can be changed using the environment variable BW_PORT_HTTP on the bitwarden container

server {
listen 443 ssl http2;
Expand Down Expand Up @@ -38,7 +42,7 @@ server {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app bitwarden;
set $upstream_port 80;
set $upstream_port 8080;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

Expand All @@ -61,7 +65,7 @@ server {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app bitwarden;
set $upstream_port 80;
set $upstream_port 8080;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

Expand All @@ -71,7 +75,7 @@ server {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app bitwarden;
set $upstream_port 80;
set $upstream_port 8080;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

Expand All @@ -81,7 +85,7 @@ server {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app bitwarden;
set $upstream_port 80;
set $upstream_port 8080;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;

Expand Down
75 changes: 0 additions & 75 deletions bitwarden.subfolder.conf.sample

This file was deleted.

6 changes: 5 additions & 1 deletion vaultwarden.subdomain.conf.sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Version 2023/11/11
## Version 2023/11/12
# make sure that your vaultwarden container is named vaultwarden
# make sure that your dns has a cname set for vaultwarden
# if you are using bitwarden (the official image), use the bitwarden conf
# if you are using vaultwarden (an unofficial implementation), use the vaultwarden conf
#
# vaultwarden defaults to port 80 and can be changed using the environment variable ROCKET_PORT on the vaultwarden container

server {
listen 443 ssl http2;
Expand Down
9 changes: 7 additions & 2 deletions vaultwarden.subfolder.conf.sample
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## Version 2023/11/11
## Version 2023/11/12
# make sure that your vaultwarden container is named vaultwarden
# make sure that vaultwarden is set to work with the base url /vaultwarden/
## Environmental Variable DOMAIN=https://<DOMAIN>/vaultwarden must be set in vaultwarden container including subfolder.
# if you are using bitwarden (the official image), use the bitwarden conf
# if you are using vaultwarden (an unofficial implementation), use the vaultwarden conf
#
# vaultwarden defaults to port 80 and can be changed using the environment variable ROCKET_PORT on the vaultwarden container
#
# Environmental Variable DOMAIN=https://<DOMAIN>/vaultwarden must be set in vaultwarden container including subfolder.

location /vaultwarden {
return 301 $scheme://$host/vaultwarden/;
Expand Down

0 comments on commit ddcc002

Please sign in to comment.