From: Jeff Godin <jgodin@tadl.org>
Date: Thu, 26 Sep 2013 15:42:23 +0000 (-0400)
Subject: Add apache config examples for AC by record id
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e5eccfe2e032c3d1e5fe4c17833a5993ee3b8bf3;p=evergreen%2Fequinox.git

Add apache config examples for AC by record id

Add apache (and apache 2.4) config examples for added content by
record id, update release notes to call out changes.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---

diff --git a/Open-ILS/examples/apache/eg.conf.in b/Open-ILS/examples/apache/eg.conf.in
index faa26a09d3..368b05761d 100644
--- a/Open-ILS/examples/apache/eg.conf.in
+++ b/Open-ILS/examples/apache/eg.conf.in
@@ -110,6 +110,7 @@ NameVirtualHost *:443
 	ServerName localhost:443
 	ServerAlias 127.0.0.1:443
 	SSLEngine on
+    SSLProxyEngine on # required for ErrorDocument 404 on SSL connections
 	SSLHonorCipherOrder On
 	SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
 
diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 1000461b66..8835b7ec34 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -74,6 +74,10 @@ RewriteEngine ON
 RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \
     /opac/images/blank.png [P,L]
 
+<Location /opac/extras/ac/jacket>
+        ErrorDocument 404 /opac/images/blank.png
+</Location>
+
 # ----------------------------------------------------------------------------------
 # Add the row ID (RID) and date so we can make unAPI happy
 # ----------------------------------------------------------------------------------
diff --git a/Open-ILS/examples/apache_24/eg.conf.in b/Open-ILS/examples/apache_24/eg.conf.in
index 67dfd53dae..b9c373cd93 100644
--- a/Open-ILS/examples/apache_24/eg.conf.in
+++ b/Open-ILS/examples/apache_24/eg.conf.in
@@ -106,6 +106,7 @@ NameVirtualHost *:443
 	ServerName localhost:443
 	ServerAlias 127.0.0.1:443
 	SSLEngine on
+    SSLProxyEngine on # required for ErrorDocument 404 on SSL connections
 	SSLHonorCipherOrder On
 	SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
 
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 2e51116904..0d67b54ff2 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -74,6 +74,10 @@ RewriteEngine ON
 RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \
     /opac/images/blank.png [P,L]
 
+<Location /opac/extras/ac/jacket>
+        ErrorDocument 404 /opac/images/blank.png
+</Location>
+
 # ----------------------------------------------------------------------------------
 # Add the row ID (RID) and date so we can make unAPI happy
 # ----------------------------------------------------------------------------------
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/added_content_by_record_id.txt b/docs/RELEASE_NOTES_NEXT/OPAC/added_content_by_record_id.txt
index 19f71829eb..2c687f488c 100644
--- a/docs/RELEASE_NOTES_NEXT/OPAC/added_content_by_record_id.txt
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/added_content_by_record_id.txt
@@ -28,3 +28,26 @@ Local Content Overrides
 Just as with ISBN lookups, there is support for local overrides in
 the form of a file created on disk which short-circuits any external
 Added Content lookup.
+
+
+Apache Configuration
+++++++++++++++++++++
+
+The example Apache configs have been updated to support serving
+blank.png when added content jacket URLs return a 404. This prevents
+"broken image" placeholders in browsers, without requiring a
+Javascript onerror handler on each img tag.
+
+The changes are as follows:
+
+In the eg.conf VirtualHost declaration for SSL, add:
+
+[source]
+SSLProxyEngine on # required for ErrorDocument 404 on SSL connections
+
+In the eg_vhost.conf file, add:
+
+[source]
+<Location /opac/extras/ac/jacket>
+        ErrorDocument 404 /opac/images/blank.png
+</Location>