From 19b101cafddaec01c03052b81ef65e99c3163e70 Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 22:27:50 -0400
Subject: [PATCH 1/2] Fix for 404 and PHP errors

---
 organizr.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index aae5aff..9acaee0 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # In order to use this location block you need to edit the default file one folder up and comment out the / location
 
-location / {
+location ^~ / {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
     #auth_basic_user_file /config/nginx/.htpasswd;
@@ -10,6 +10,7 @@ location / {
     #error_page 401 =200 /login;
 
     include /config/nginx/proxy.conf;
+    proxy_intercept_errors on;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
     set $upstream_port 80;

From 434f53684691d22b6a894cc6c26fb29dd438ca45 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 23 Mar 2020 15:15:54 -0500
Subject: [PATCH 2/2] Update organizr.subfolder.conf.sample

Reordering to keep in line with other samples
---
 organizr.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 9acaee0..ab3f621 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -10,13 +10,14 @@ location ^~ / {
     #error_page 401 =200 /login;
 
     include /config/nginx/proxy.conf;
-    proxy_intercept_errors on;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
     set $upstream_port 80;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+    proxy_intercept_errors on;
+
 }
 
 # Optional redirect server errors to organizr error pages