From d831c917c561fd48db2fc9f94f71bcc48a8c1d94 Mon Sep 17 00:00:00 2001
From: "J. Scott Elblein" <stardogg@gmail.com>
Date: Mon, 8 Jul 2019 15:24:35 -0500
Subject: [PATCH 1/2] Create adminer.subfolder.conf.sample

Here's a subfolder sample for Adminer: https://www.adminer.org

You may or may not want to change the `$http_host` as per our previous discussions on it; it's what works for me.
---
 adminer.subfolder.conf | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 adminer.subfolder.conf

diff --git a/adminer.subfolder.conf b/adminer.subfolder.conf
new file mode 100644
index 0000000..f2b0bb2
--- /dev/null
+++ b/adminer.subfolder.conf
@@ -0,0 +1,19 @@
+# adminer does not require a base url setting
+
+location /adminer {
+    return 301 $scheme://$http_host/adminer/;
+}
+location ^~ /adminer/ {
+    # 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, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_adminer adminer;
+    proxy_pass http://$upstream_adminer:8080;
+}

From d11f02fbcd7e31fc55f6d86b23604156259ce5d3 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Mon, 8 Jul 2019 16:56:25 -0400
Subject: [PATCH 2/2] fix file name and host variable

---
 adminer.subfolder.conf => adminer.subfolder.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename adminer.subfolder.conf => adminer.subfolder.conf.sample (78%)

diff --git a/adminer.subfolder.conf b/adminer.subfolder.conf.sample
similarity index 78%
rename from adminer.subfolder.conf
rename to adminer.subfolder.conf.sample
index f2b0bb2..73450f4 100644
--- a/adminer.subfolder.conf
+++ b/adminer.subfolder.conf.sample
@@ -1,7 +1,7 @@
-# adminer does not require a base url setting
+# adminer does not require a base url setting, but the container needs to be named adminer
 
 location /adminer {
-    return 301 $scheme://$http_host/adminer/;
+    return 301 $scheme://$host/adminer/;
 }
 location ^~ /adminer/ {
     # enable the next two lines for http auth