From 0ee27183285440929ae240a879eac1b8ef882bee Mon Sep 17 00:00:00 2001
From: Akirainblack <37367305+Akirainblack@users.noreply.github.com>
Date: Fri, 5 Feb 2021 10:39:11 +0000
Subject: [PATCH 1/2] Add files via upload

---
 bitwarden.subfolder.conf.sample | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 bitwarden.subfolder.conf.sample

diff --git a/bitwarden.subfolder.conf.sample b/bitwarden.subfolder.conf.sample
new file mode 100644
index 0000000..e643903
--- /dev/null
+++ b/bitwarden.subfolder.conf.sample
@@ -0,0 +1,48 @@
+## Version 2021/02/05
+## Environmental Variable DOMAIN=https://<DOMAIN>/bitwarden must be set in bitwarden container including subfolder.
+## This is using ports 80 and 3012
+location /bitwarden {
+    return 301 $scheme://$host/bitwarden/;
+}
+
+    location ^~ /bitwarden/ {
+        # 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;
+
+    }
+
+    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 {
+        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;
+
+    }
+

From bd361f2e1d5fbd09f206d21762fbe019c31f79c2 Mon Sep 17 00:00:00 2001
From: Akirainblack <37367305+Akirainblack@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:44:59 +0000
Subject: [PATCH 2/2] Update bitwarden.subfolder.conf.sample

Spaces removed as requested.
---
 bitwarden.subfolder.conf.sample | 64 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/bitwarden.subfolder.conf.sample b/bitwarden.subfolder.conf.sample
index e643903..2d6adc2 100644
--- a/bitwarden.subfolder.conf.sample
+++ b/bitwarden.subfolder.conf.sample
@@ -5,44 +5,44 @@ location /bitwarden {
     return 301 $scheme://$host/bitwarden/;
 }
 
-    location ^~ /bitwarden/ {
-        # enable the next two lines for http auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
+location ^~ /bitwarden/ {
+    # 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 the next two lines for ldap auth
+    #auth_request /auth;
+    #error_page 401 =200 /ldaplogin;
 
-        # enable for Authelia
-        #include /config/nginx/authelia-location.conf;
+    # 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;
+    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;
 
-    }
+}
 
-    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 {
+    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 {
-        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;
+location /notifications/hub/negotiate {
+    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;
 
-    }
+}