From 6d48cdaadfc046280e7432c153cd938bbe31ed08 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Tue, 29 Mar 2022 10:34:55 -0400
Subject: [PATCH] Add support for calibre content server at a subfolder

---
 calibre.subdomain.conf.sample | 29 ++++++++++++++++++++++++++++-
 calibre.subfolder.conf.sample | 30 +++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
index 8da0788..e17c0b9 100644
--- a/calibre.subdomain.conf.sample
+++ b/calibre.subdomain.conf.sample
@@ -1,5 +1,8 @@
-## Version 2021/05/18
+## Version 2022/03/29
 # make sure that your dns has a cname set for calibre
+# for the content server, go into calibre preferences / sharing over the net / advanced and
+# set the first option for prefix url to '/content-server', save and restart the container
+# the content server will be accessible at 'https://calibre.domain.com/content-server/'
 
 server {
     listen 443 ssl;
@@ -38,4 +41,28 @@ server {
 
         proxy_buffering off;
     }
+
+    location /content-server {
+        return 301 $scheme://$host/content-server/;
+    }
+
+    location ^~ /content-server/ {
+        # 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 calibre;
+        set $upstream_port 8081;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    }
 }
diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
index 9bf74bb..20095ce 100644
--- a/calibre.subfolder.conf.sample
+++ b/calibre.subfolder.conf.sample
@@ -1,5 +1,8 @@
-## Version 2021/06/28
+## Version 2022/03/29
 # In calibre docker arguments, set an env variable for SUBFOLDER=/calibre/
+# for the content server, go into calibre preferences / sharing over the net / advanced and
+# set the first option for prefix url to '/content-server', save and restart the container
+# the content server will be accessible at 'https://domain.com/content-server/'
 
 location /calibre {
     return 301 $scheme://$host/calibre/;
@@ -25,3 +28,28 @@ location ^~ /calibre/ {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
 }
+
+location /content-server {
+    return 301 $scheme://$host/content-server/;
+}
+
+location ^~ /content-server/ {
+    # 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 /ldaplogin;
+
+    # enable for Authelia, also enable authelia-server.conf in the default site config
+    #include /config/nginx/authelia-location.conf;
+
+    include /config/nginx/proxy.conf;
+    include /config/nginx/resolver.conf;
+    set $upstream_app calibre;
+    set $upstream_port 8081;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}