From 5ae34b8739f1d5819263b78ba5902b95b2132984 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 10 Oct 2018 20:19:22 -0400
Subject: [PATCH 1/3] Update calibre-web.conf.j2

---
 roles/calibre-web/templates/calibre-web.conf.j2 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2
index 33a95a950..49f4f0589 100644
--- a/roles/calibre-web/templates/calibre-web.conf.j2
+++ b/roles/calibre-web/templates/calibre-web.conf.j2
@@ -1,8 +1,8 @@
-<VirtualHost *:80>
-    <Location "{{ calibreweb_url }}" >
-        RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
-        RequestHeader set X-SCHEME http
-        ProxyPass http://localhost:{{ calibreweb_port }}/
-        ProxyPassReverse http://localhost:{{ calibreweb_port }}/
-    </Location>
-</VirtualHost>
+#<VirtualHost *:80>    # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196)
+#    <Location "{{ calibreweb_url }}" >    # This line appears unnecessary
+RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
+RequestHeader set X-SCHEME http
+ProxyPass http://localhost:{{ calibreweb_port }}/
+ProxyPassReverse http://localhost:{{ calibreweb_port }}/
+#    </Location>
+#</VirtualHost>

From 211ededa1c56ec21ab73899a1b0a687d52cca615 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 10 Oct 2018 20:32:53 -0400
Subject: [PATCH 2/3] Update calibre-web.conf.j2

---
 roles/calibre-web/templates/calibre-web.conf.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2
index 49f4f0589..f15f0692d 100644
--- a/roles/calibre-web/templates/calibre-web.conf.j2
+++ b/roles/calibre-web/templates/calibre-web.conf.j2
@@ -1,8 +1,8 @@
 #<VirtualHost *:80>    # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196)
-#    <Location "{{ calibreweb_url }}" >    # This line appears unnecessary
+#    <Location "{{ calibreweb_url }}" >                            # Line unnec when "/proxy" added to Proxy* directives below
 RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
-RequestHeader set X-SCHEME http
-ProxyPass http://localhost:{{ calibreweb_port }}/
-ProxyPassReverse http://localhost:{{ calibreweb_port }}/
+RequestHeader set X-SCHEME http                                    # Line unnec?
+ProxyPass /books http://localhost:{{ calibreweb_port }}/
+ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/    # Line unnec?
 #    </Location>
 #</VirtualHost>

From 2be51541cbb94a5b1a6d35996057db49326142a0 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 10 Oct 2018 20:44:08 -0400
Subject: [PATCH 3/3] Update calibre-web.conf.j2

---
 .../calibre-web/templates/calibre-web.conf.j2 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/roles/calibre-web/templates/calibre-web.conf.j2 b/roles/calibre-web/templates/calibre-web.conf.j2
index f15f0692d..a5efcabe9 100644
--- a/roles/calibre-web/templates/calibre-web.conf.j2
+++ b/roles/calibre-web/templates/calibre-web.conf.j2
@@ -1,8 +1,19 @@
-#<VirtualHost *:80>    # This line (which used to work) prevented http://box/books from working as of October 2018 (https://github.com/iiab/iiab/issues/1196)
-#    <Location "{{ calibreweb_url }}" >                            # Line unnec when "/proxy" added to Proxy* directives below
+# Used to work (in August 2018) but prevented http://box/books from working (in October 2018, https://github.com/iiab/iiab/issues/1196)
+#<VirtualHost *:80>
+
+# Unnec when "/proxy" is added to Proxy* directives further below
+#    <Location "{{ calibreweb_url }}" >
+
 RequestHeader set X-SCRIPT-NAME {{ calibreweb_url }}
-RequestHeader set X-SCHEME http                                    # Line unnec?
+
+# Appears unnec:
+RequestHeader set X-SCHEME http
+
 ProxyPass /books http://localhost:{{ calibreweb_port }}/
-ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/    # Line unnec?
+
+# Appears unnec:
+ProxyPassReverse /books http://localhost:{{ calibreweb_port }}/
+
 #    </Location>
+
 #</VirtualHost>